Restructure source code

diff --git a/Makefile.am b/Makefile.am
index 658bd0413747d35ad12c76e5aa7cb8eff3dec0f8..ae8b1eb0e445cc339683f343007201ff31eb01aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,18 @@
-SUBDIRS = include host external source patch contrib
+SUBDIRS = include host external source patch loader bits
+
 ACLOCAL_AMFLAGS = -I m4
 
-source: include host external patch contrib
+source: include host external patch
 
 external: include host
 
+loader: external
+
 install:
        @echo "Please don't call the install target directly, it doesn't work."
        @exit 1
 
-all-local:
+all-local: external loader source bits
        mkdir -p out
        mkdir -p out@prefix@
        mkdir -p out@libdir@/module
@@ -30,7 +33,7 @@ all-local:
        cp external/bits/*.bin out@libexecdir@/
        cp host/termfont.bin out@datarootdir@/
        cp patch/*.vco out@sbindir@
-       cp contrib/*.vco out@bindir@
+       cp external/contrib_patch/*.vco out@bindir@
        cat host/generate_localeemu.sh.in | sed "s|\@localedir\@|@localedir@|g" > out/generate_localeemu.sh
        chmod +x out/generate_localeemu.sh
        cat host/o3ds_firm.sh.in | sed "s|\@libdir\@|@libdir@|g" > out/o3ds_firm.sh

diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644 (file)
index 5d293db..0000000
--- a/TODO.txt
+++ /dev/null
@@ -1 +0,0 @@
-Note that the branch name here is now a misnomer. It should be called wip/the_great_unclusterfuck now. Really.

diff --git a/external/bits/Makefile b/bits/Makefile
similarity index 100%
rename from external/bits/Makefile
rename to bits/Makefile

diff --git a/external/bits/README.md b/bits/README.md
similarity index 100%
rename from external/bits/README.md
rename to bits/README.md

diff --git a/external/bits/backdoor.s b/bits/backdoor.s
similarity index 100%
rename from external/bits/backdoor.s
rename to bits/backdoor.s

diff --git a/external/bits/chain.s b/bits/chain.s
similarity index 100%
rename from external/bits/chain.s
rename to bits/chain.s

diff --git a/external/bits/emunand.s b/bits/emunand.s
similarity index 100%
rename from external/bits/emunand.s
rename to bits/emunand.s

diff --git a/external/bits/link.ld b/bits/link.ld
similarity index 100%
rename from external/bits/link.ld
rename to bits/link.ld

diff --git a/external/bits/reboot_code.s b/bits/reboot_code.s
similarity index 100%
rename from external/bits/reboot_code.s
rename to bits/reboot_code.s

diff --git a/external/bits/reboot_hook.s b/bits/reboot_hook.s
similarity index 100%
rename from external/bits/reboot_hook.s
rename to bits/reboot_hook.s

diff --git a/external/bits/stub.s b/bits/stub.s
similarity index 100%
rename from external/bits/stub.s
rename to bits/stub.s

diff --git a/source/Makefile.am b/boot/Makefile.am
similarity index 100%
rename from source/Makefile.am
rename to boot/Makefile.am

diff --git a/source/arm11.c b/boot/arm11.c
similarity index 100%
rename from source/arm11.c
rename to boot/arm11.c

diff --git a/source/chainloader.c b/boot/chainloader.c
similarity index 100%
rename from source/chainloader.c
rename to boot/chainloader.c

diff --git a/source/configback/dummy.c b/boot/configback/dummy.c
similarity index 100%
rename from source/configback/dummy.c
rename to boot/configback/dummy.c

diff --git a/source/configback/file-dat.c b/boot/configback/file-dat.c
similarity index 100%
rename from source/configback/file-dat.c
rename to boot/configback/file-dat.c

diff --git a/source/corbenik.c b/boot/corbenik.c
similarity index 100%
rename from source/corbenik.c
rename to boot/corbenik.c

diff --git a/source/firm/decryptor.c b/boot/firm/decryptor.c
similarity index 100%
rename from source/firm/decryptor.c
rename to boot/firm/decryptor.c

diff --git a/source/firm/firm.c b/boot/firm/firm.c
similarity index 100%
rename from source/firm/firm.c
rename to boot/firm/firm.c

diff --git a/source/firm/firmlaunch.c b/boot/firm/firmlaunch.c
similarity index 100%
rename from source/firm/firmlaunch.c
rename to boot/firm/firmlaunch.c

diff --git a/source/firm/keys.c b/boot/firm/keys.c
similarity index 100%
rename from source/firm/keys.c
rename to boot/firm/keys.c

diff --git a/source/firm/util.c b/boot/firm/util.c
similarity index 100%
rename from source/firm/util.c
rename to boot/firm/util.c

diff --git a/source/firm/version.c b/boot/firm/version.c
similarity index 100%
rename from source/firm/version.c
rename to boot/firm/version.c

diff --git a/source/input.c b/boot/input.c
similarity index 100%
rename from source/input.c
rename to boot/input.c

diff --git a/source/interpreter.c b/boot/interpreter.c
similarity index 100%
rename from source/interpreter.c
rename to boot/interpreter.c

diff --git a/source/interrupt.c b/boot/interrupt.c
similarity index 100%
rename from source/interrupt.c
rename to boot/interrupt.c

diff --git a/source/linker.ld b/boot/linker.ld
similarity index 100%
rename from source/linker.ld
rename to boot/linker.ld

diff --git a/source/menu-backend.c b/boot/menu-backend.c
similarity index 100%
rename from source/menu-backend.c
rename to boot/menu-backend.c

diff --git a/source/menu.c b/boot/menu.c
similarity index 100%
rename from source/menu.c
rename to boot/menu.c

diff --git a/source/patch/emunand.c b/boot/patch/emunand.c
similarity index 100%
rename from source/patch/emunand.c
rename to boot/patch/emunand.c

diff --git a/source/patch/module.c b/boot/patch/module.c
similarity index 100%
rename from source/patch/module.c
rename to boot/patch/module.c

diff --git a/source/patch/reboot.c b/boot/patch/reboot.c
similarity index 100%
rename from source/patch/reboot.c
rename to boot/patch/reboot.c

diff --git a/source/patch/svc.c b/boot/patch/svc.c
similarity index 100%
rename from source/patch/svc.c
rename to boot/patch/svc.c

diff --git a/source/patcher.c b/boot/patcher.c
similarity index 100%
rename from source/patcher.c
rename to boot/patcher.c

diff --git a/source/start.s b/boot/start.s
similarity index 100%
rename from source/start.s
rename to boot/start.s

diff --git a/source/std/abort.c b/boot/std/abort.c
similarity index 100%
rename from source/std/abort.c
rename to boot/std/abort.c

diff --git a/source/std/draw.c b/boot/std/draw.c
similarity index 100%
rename from source/std/draw.c
rename to boot/std/draw.c

diff --git a/source/std/fs.c b/boot/std/fs.c
similarity index 100%
rename from source/std/fs.c
rename to boot/std/fs.c

diff --git a/source/std/memory.c b/boot/std/memory.c
similarity index 100%
rename from source/std/memory.c
rename to boot/std/memory.c

diff --git a/configure.ac b/configure.ac
index 9581a7a908d8ca53758cc79811763e356db9853d..cd9170872d41957c54860bf000d334c910794c23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ CHAINLOADER=1
 test "$enable_chainloader" = "no" && CHAINLOADER=0
 AC_DEFINE_UNQUOTED([CHAINLOADER], [$CHAINLOADER])
 
-AC_CONFIG_FILES([Makefile source/Makefile external/Makefile include/Makefile])
+AC_CONFIG_FILES([Makefile boot/Makefile external/Makefile include/Makefile])
 
 AC_CONFIG_SUBDIRS([external/libctr9])
 

diff --git a/external/Makefile.am b/external/Makefile.am
index 148f4de3b602c987e58069fed61337428d76d5b9..d60b1df41641c00fa0df8330e8b63cd0deea2a2e 100644 (file)
--- a/external/Makefile.am
+++ b/external/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = libctr9 ctrulib/libctru loader bits
-
-loader: ctrulib/libctru
+SUBDIRS = libctr9 ctrulib/libctru contrib_patch
 
 install:

diff --git a/contrib/2x-firmprot.pco b/external/contrib_patch/2x-firmprot.pco
similarity index 100%
rename from contrib/2x-firmprot.pco
rename to external/contrib_patch/2x-firmprot.pco

diff --git a/contrib/Makefile b/external/contrib_patch/Makefile
similarity index 82%
rename from contrib/Makefile
rename to external/contrib_patch/Makefile
index 3dc0cfc5d51b50422929e3b5f09b37d0914466f3..ff0c9892520f02cac69ccdf2132bb4561a170bff 100644 (file)
--- a/contrib/Makefile
+++ b/external/contrib_patch/Makefile
@@ -8,7 +8,7 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco))
 install:
 
 %.vco: %.pco
-       ../host/bytecode_asm.py $< $@
+       ../../host/bytecode_asm.py $< $@
 
 clean:
        rm -f *.vco

diff --git a/contrib/README.md b/external/contrib_patch/README.md
similarity index 100%
rename from contrib/README.md
rename to external/contrib_patch/README.md

diff --git a/contrib/mysterymachine.pco b/external/contrib_patch/mysterymachine.pco
similarity index 100%
rename from contrib/mysterymachine.pco
rename to external/contrib_patch/mysterymachine.pco

diff --git a/contrib/remove_outlines-sm.pco b/external/contrib_patch/remove_outlines-sm.pco
similarity index 100%
rename from contrib/remove_outlines-sm.pco
rename to external/contrib_patch/remove_outlines-sm.pco

diff --git a/contrib/svc_permission_chk_dis.pco b/external/contrib_patch/svc_permission_chk_dis.pco
similarity index 100%
rename from contrib/svc_permission_chk_dis.pco
rename to external/contrib_patch/svc_permission_chk_dis.pco

diff --git a/external/loader/LICENSE b/loader/LICENSE
similarity index 100%
rename from external/loader/LICENSE
rename to loader/LICENSE

diff --git a/external/loader/Makefile b/loader/Makefile
similarity index 100%
rename from external/loader/Makefile
rename to loader/Makefile

diff --git a/external/loader/README.md b/loader/README.md
similarity index 100%
rename from external/loader/README.md
rename to loader/README.md

diff --git a/external/loader/loader.rsf b/loader/loader.rsf
similarity index 100%
rename from external/loader/loader.rsf
rename to loader/loader.rsf

diff --git a/external/loader/source/interp.c b/loader/source/interp.c
similarity index 100%
rename from external/loader/source/interp.c
rename to loader/source/interp.c

diff --git a/external/loader/source/interp.h b/loader/source/interp.h
similarity index 100%
rename from external/loader/source/interp.h
rename to loader/source/interp.h

diff --git a/external/loader/source/loader.c b/loader/source/loader.c
similarity index 100%
rename from external/loader/source/loader.c
rename to loader/source/loader.c

diff --git a/external/loader/source/logger.c b/loader/source/logger.c
similarity index 100%
rename from external/loader/source/logger.c
rename to loader/source/logger.c

diff --git a/external/loader/source/logger.h b/loader/source/logger.h
similarity index 100%
rename from external/loader/source/logger.h
rename to loader/source/logger.h

diff --git a/external/loader/source/memory.c b/loader/source/memory.c
similarity index 100%
rename from external/loader/source/memory.c
rename to loader/source/memory.c

diff --git a/external/loader/source/memory.h b/loader/source/memory.h
similarity index 100%
rename from external/loader/source/memory.h
rename to loader/source/memory.h

diff --git a/external/loader/source/patcher.c b/loader/source/patcher.c
similarity index 100%
rename from external/loader/source/patcher.c
rename to loader/source/patcher.c

diff --git a/external/loader/source/patcher.h b/loader/source/patcher.h
similarity index 100%
rename from external/loader/source/patcher.h
rename to loader/source/patcher.h

diff --git a/external/loader/source/statics.c b/loader/source/statics.c
similarity index 100%
rename from external/loader/source/statics.c
rename to loader/source/statics.c

diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644 (file)
index 3dc0cfc..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-.PHONY: all
-all: build
-
-.PHONY: build
-build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco))
-
-.PHONY: install
-install:
-
-%.vco: %.pco
-       ../host/bytecode_asm.py $< $@
-
-clean:
-       rm -f *.vco

diff --git a/test/vm-test1.pco b/test/vm-test1.pco
deleted file mode 100644 (file)
index e6b0610..0000000
--- a/test/vm-test1.pco
+++ /dev/null
@@ -1,10 +0,0 @@
-# $name  Test Suite (DO NOT ENABLE)
-# $desc  THIS IS FOR INTERNAL USE ONLY BY UNIT TESTS. DO NOT ENABLE IT.
-# $title 0000000000000000
-# $ver   00
-# $uuid  FF
-
-find "test"
-abortnf
-set  "best"
-