diff --git a/coremark-bench/Makefile b/benchmarks/coremark/Makefile similarity index 100% rename from coremark-bench/Makefile rename to benchmarks/coremark/Makefile diff --git a/coremark-bench/include/core_portme.h b/benchmarks/coremark/include/core_portme.h similarity index 100% rename from coremark-bench/include/core_portme.h rename to benchmarks/coremark/include/core_portme.h diff --git a/coremark-bench/include/coremark.h b/benchmarks/coremark/include/coremark.h similarity index 100% rename from coremark-bench/include/coremark.h rename to benchmarks/coremark/include/coremark.h diff --git a/coremark-bench/src/core_list_join.c b/benchmarks/coremark/src/core_list_join.c similarity index 100% rename from coremark-bench/src/core_list_join.c rename to benchmarks/coremark/src/core_list_join.c diff --git a/coremark-bench/src/core_main.c b/benchmarks/coremark/src/core_main.c similarity index 100% rename from coremark-bench/src/core_main.c rename to benchmarks/coremark/src/core_main.c diff --git a/coremark-bench/src/core_matrix.c b/benchmarks/coremark/src/core_matrix.c similarity index 100% rename from coremark-bench/src/core_matrix.c rename to benchmarks/coremark/src/core_matrix.c diff --git a/coremark-bench/src/core_portme.c b/benchmarks/coremark/src/core_portme.c similarity index 100% rename from coremark-bench/src/core_portme.c rename to benchmarks/coremark/src/core_portme.c diff --git a/coremark-bench/src/core_state.c b/benchmarks/coremark/src/core_state.c similarity index 100% rename from coremark-bench/src/core_state.c rename to benchmarks/coremark/src/core_state.c diff --git a/coremark-bench/src/core_util.c b/benchmarks/coremark/src/core_util.c similarity index 100% rename from coremark-bench/src/core_util.c rename to benchmarks/coremark/src/core_util.c diff --git a/dhrystone-bench/Makefile b/benchmarks/dhrystone/Makefile similarity index 100% rename from dhrystone-bench/Makefile rename to benchmarks/dhrystone/Makefile diff --git a/dhrystone-bench/dry.c b/benchmarks/dhrystone/dry.c similarity index 100% rename from dhrystone-bench/dry.c rename to benchmarks/dhrystone/dry.c diff --git a/micro-bench/Makefile b/benchmarks/micro/Makefile similarity index 100% rename from micro-bench/Makefile rename to benchmarks/micro/Makefile diff --git a/micro-bench/include/benchmark.h b/benchmarks/micro/include/benchmark.h similarity index 100% rename from micro-bench/include/benchmark.h rename to benchmarks/micro/include/benchmark.h diff --git a/micro-bench/src/15pz/15pz.cc b/benchmarks/micro/src/15pz/15pz.cc similarity index 100% rename from micro-bench/src/15pz/15pz.cc rename to benchmarks/micro/src/15pz/15pz.cc diff --git a/micro-bench/src/15pz/heap.h b/benchmarks/micro/src/15pz/heap.h similarity index 100% rename from micro-bench/src/15pz/heap.h rename to benchmarks/micro/src/15pz/heap.h diff --git a/micro-bench/src/15pz/puzzle.h b/benchmarks/micro/src/15pz/puzzle.h similarity index 100% rename from micro-bench/src/15pz/puzzle.h rename to benchmarks/micro/src/15pz/puzzle.h diff --git a/micro-bench/src/bench.c b/benchmarks/micro/src/bench.c similarity index 100% rename from micro-bench/src/bench.c rename to benchmarks/micro/src/bench.c diff --git a/micro-bench/src/bf/bf.c b/benchmarks/micro/src/bf/bf.c similarity index 100% rename from micro-bench/src/bf/bf.c rename to benchmarks/micro/src/bf/bf.c diff --git a/micro-bench/src/dinic/dinic.cc b/benchmarks/micro/src/dinic/dinic.cc similarity index 100% rename from micro-bench/src/dinic/dinic.cc rename to benchmarks/micro/src/dinic/dinic.cc diff --git a/micro-bench/src/fib/fib.c b/benchmarks/micro/src/fib/fib.c similarity index 100% rename from micro-bench/src/fib/fib.c rename to benchmarks/micro/src/fib/fib.c diff --git a/micro-bench/src/lzip/lzip.c b/benchmarks/micro/src/lzip/lzip.c similarity index 100% rename from micro-bench/src/lzip/lzip.c rename to benchmarks/micro/src/lzip/lzip.c diff --git a/micro-bench/src/lzip/quicklz.c b/benchmarks/micro/src/lzip/quicklz.c similarity index 100% rename from micro-bench/src/lzip/quicklz.c rename to benchmarks/micro/src/lzip/quicklz.c diff --git a/micro-bench/src/lzip/quicklz.h b/benchmarks/micro/src/lzip/quicklz.h similarity index 100% rename from micro-bench/src/lzip/quicklz.h rename to benchmarks/micro/src/lzip/quicklz.h diff --git a/micro-bench/src/md5/md5.c b/benchmarks/micro/src/md5/md5.c similarity index 100% rename from micro-bench/src/md5/md5.c rename to benchmarks/micro/src/md5/md5.c diff --git a/micro-bench/src/qsort/qsort.c b/benchmarks/micro/src/qsort/qsort.c similarity index 100% rename from micro-bench/src/qsort/qsort.c rename to benchmarks/micro/src/qsort/qsort.c diff --git a/micro-bench/src/queen/queen.c b/benchmarks/micro/src/queen/queen.c similarity index 100% rename from micro-bench/src/queen/queen.c rename to benchmarks/micro/src/queen/queen.c diff --git a/micro-bench/src/sieve/sieve.c b/benchmarks/micro/src/sieve/sieve.c similarity index 100% rename from micro-bench/src/sieve/sieve.c rename to benchmarks/micro/src/sieve/sieve.c diff --git a/micro-bench/src/ssort/ssort.cc b/benchmarks/micro/src/ssort/ssort.cc similarity index 100% rename from micro-bench/src/ssort/ssort.cc rename to benchmarks/micro/src/ssort/ssort.cc diff --git a/hello/Makefile b/kernels/hello/Makefile similarity index 100% rename from hello/Makefile rename to kernels/hello/Makefile diff --git a/hello/hello.c b/kernels/hello/hello.c similarity index 100% rename from hello/hello.c rename to kernels/hello/hello.c diff --git a/litenes/Makefile b/kernels/litenes/Makefile similarity index 100% rename from litenes/Makefile rename to kernels/litenes/Makefile diff --git a/litenes/src/common.c b/kernels/litenes/src/common.c similarity index 100% rename from litenes/src/common.c rename to kernels/litenes/src/common.c diff --git a/litenes/src/common.h b/kernels/litenes/src/common.h similarity index 100% rename from litenes/src/common.h rename to kernels/litenes/src/common.h diff --git a/litenes/src/cpu-addressing.c b/kernels/litenes/src/cpu-addressing.c similarity index 100% rename from litenes/src/cpu-addressing.c rename to kernels/litenes/src/cpu-addressing.c diff --git a/litenes/src/cpu-internal.h b/kernels/litenes/src/cpu-internal.h similarity index 100% rename from litenes/src/cpu-internal.h rename to kernels/litenes/src/cpu-internal.h diff --git a/litenes/src/cpu.c b/kernels/litenes/src/cpu.c similarity index 100% rename from litenes/src/cpu.c rename to kernels/litenes/src/cpu.c diff --git a/litenes/src/cpu.h b/kernels/litenes/src/cpu.h similarity index 100% rename from litenes/src/cpu.h rename to kernels/litenes/src/cpu.h diff --git a/litenes/src/fce.c b/kernels/litenes/src/fce.c similarity index 85% rename from litenes/src/fce.c rename to kernels/litenes/src/fce.c index fd00491..28b2cbd 100644 --- a/litenes/src/fce.c +++ b/kernels/litenes/src/fce.c @@ -136,20 +136,3 @@ void fce_update_screen() { for (int i = 0; i < SCR_W * SCR_H; i ++) canvas[i] = bgc; } - -extern unsigned char rom_mario_nes[]; - -int main(const char *rom_name) { - ioe_init(); - - printf("Play: [%s] SELECT [%s] START [%s]\n" - " [%s] [%s] [%s] A [%s] B [%s]\n", - TOSTRING(KEY_UP), TOSTRING(KEY_SELECT), TOSTRING(KEY_START), - TOSTRING(KEY_LEFT), TOSTRING(KEY_DOWN), TOSTRING(KEY_RIGHT), - TOSTRING(KEY_A), TOSTRING(KEY_B)); - - fce_load_rom((void *)rom_mario_nes); - fce_init(); - fce_run(); - return 1; -} diff --git a/litenes/src/fce.h b/kernels/litenes/src/fce.h similarity index 93% rename from litenes/src/fce.h rename to kernels/litenes/src/fce.h index af40a45..4109ebd 100644 --- a/litenes/src/fce.h +++ b/kernels/litenes/src/fce.h @@ -8,6 +8,9 @@ #define SCR_H 240 void fce_update_screen(); +int fce_load_rom(char *rom); +void fce_init(); +void fce_run(); void draw(int x, int y, int idx); static const uint32_t palette[64] = { diff --git a/kernels/litenes/src/main.c b/kernels/litenes/src/main.c new file mode 100644 index 0000000..4139e97 --- /dev/null +++ b/kernels/litenes/src/main.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "fce.h" +#include "psg.h" + +extern char rom_mario_nes[]; + +int main() { + ioe_init(); + + printf("Play: [%s] SELECT [%s] START [%s]\n" + " [%s] [%s] [%s] A [%s] B [%s]\n", + TOSTRING(KEY_UP), TOSTRING(KEY_SELECT), TOSTRING(KEY_START), + TOSTRING(KEY_LEFT), TOSTRING(KEY_DOWN), TOSTRING(KEY_RIGHT), + TOSTRING(KEY_A), TOSTRING(KEY_B)); + + fce_load_rom((void *)rom_mario_nes); + fce_init(); + fce_run(); + return 1; +} diff --git a/litenes/src/mario-rom.c b/kernels/litenes/src/mario-rom.c similarity index 100% rename from litenes/src/mario-rom.c rename to kernels/litenes/src/mario-rom.c diff --git a/litenes/src/memory.c b/kernels/litenes/src/memory.c similarity index 100% rename from litenes/src/memory.c rename to kernels/litenes/src/memory.c diff --git a/litenes/src/memory.h b/kernels/litenes/src/memory.h similarity index 100% rename from litenes/src/memory.h rename to kernels/litenes/src/memory.h diff --git a/litenes/src/mmc.c b/kernels/litenes/src/mmc.c similarity index 100% rename from litenes/src/mmc.c rename to kernels/litenes/src/mmc.c diff --git a/litenes/src/mmc.h b/kernels/litenes/src/mmc.h similarity index 100% rename from litenes/src/mmc.h rename to kernels/litenes/src/mmc.h diff --git a/litenes/src/ppu.c b/kernels/litenes/src/ppu.c similarity index 100% rename from litenes/src/ppu.c rename to kernels/litenes/src/ppu.c diff --git a/litenes/src/ppu.h b/kernels/litenes/src/ppu.h similarity index 100% rename from litenes/src/ppu.h rename to kernels/litenes/src/ppu.h diff --git a/litenes/src/psg.c b/kernels/litenes/src/psg.c similarity index 100% rename from litenes/src/psg.c rename to kernels/litenes/src/psg.c diff --git a/litenes/src/psg.h b/kernels/litenes/src/psg.h similarity index 100% rename from litenes/src/psg.h rename to kernels/litenes/src/psg.h diff --git a/thread-os/Makefile b/kernels/thread-os/Makefile similarity index 100% rename from thread-os/Makefile rename to kernels/thread-os/Makefile diff --git a/thread-os/thread-os.c b/kernels/thread-os/thread-os.c similarity index 100% rename from thread-os/thread-os.c rename to kernels/thread-os/thread-os.c diff --git a/cpu-tests/.gitignore b/tests/cpu-tests/.gitignore similarity index 100% rename from cpu-tests/.gitignore rename to tests/cpu-tests/.gitignore diff --git a/cpu-tests/Makefile b/tests/cpu-tests/Makefile similarity index 100% rename from cpu-tests/Makefile rename to tests/cpu-tests/Makefile diff --git a/cpu-tests/include/trap.h b/tests/cpu-tests/include/trap.h similarity index 100% rename from cpu-tests/include/trap.h rename to tests/cpu-tests/include/trap.h diff --git a/cpu-tests/tests/add-longlong.c b/tests/cpu-tests/tests/add-longlong.c similarity index 100% rename from cpu-tests/tests/add-longlong.c rename to tests/cpu-tests/tests/add-longlong.c diff --git a/cpu-tests/tests/add.c b/tests/cpu-tests/tests/add.c similarity index 100% rename from cpu-tests/tests/add.c rename to tests/cpu-tests/tests/add.c diff --git a/cpu-tests/tests/bit.c b/tests/cpu-tests/tests/bit.c similarity index 100% rename from cpu-tests/tests/bit.c rename to tests/cpu-tests/tests/bit.c diff --git a/cpu-tests/tests/bubble-sort.c b/tests/cpu-tests/tests/bubble-sort.c similarity index 100% rename from cpu-tests/tests/bubble-sort.c rename to tests/cpu-tests/tests/bubble-sort.c diff --git a/cpu-tests/tests/div.c b/tests/cpu-tests/tests/div.c similarity index 100% rename from cpu-tests/tests/div.c rename to tests/cpu-tests/tests/div.c diff --git a/cpu-tests/tests/dummy.c b/tests/cpu-tests/tests/dummy.c similarity index 100% rename from cpu-tests/tests/dummy.c rename to tests/cpu-tests/tests/dummy.c diff --git a/cpu-tests/tests/fact.c b/tests/cpu-tests/tests/fact.c similarity index 100% rename from cpu-tests/tests/fact.c rename to tests/cpu-tests/tests/fact.c diff --git a/cpu-tests/tests/fib.c b/tests/cpu-tests/tests/fib.c similarity index 100% rename from cpu-tests/tests/fib.c rename to tests/cpu-tests/tests/fib.c diff --git a/cpu-tests/tests/goldbach.c b/tests/cpu-tests/tests/goldbach.c similarity index 100% rename from cpu-tests/tests/goldbach.c rename to tests/cpu-tests/tests/goldbach.c diff --git a/cpu-tests/tests/hello-str.c b/tests/cpu-tests/tests/hello-str.c similarity index 100% rename from cpu-tests/tests/hello-str.c rename to tests/cpu-tests/tests/hello-str.c diff --git a/cpu-tests/tests/if-else.c b/tests/cpu-tests/tests/if-else.c similarity index 100% rename from cpu-tests/tests/if-else.c rename to tests/cpu-tests/tests/if-else.c diff --git a/cpu-tests/tests/leap-year.c b/tests/cpu-tests/tests/leap-year.c similarity index 100% rename from cpu-tests/tests/leap-year.c rename to tests/cpu-tests/tests/leap-year.c diff --git a/cpu-tests/tests/load-store.c b/tests/cpu-tests/tests/load-store.c similarity index 100% rename from cpu-tests/tests/load-store.c rename to tests/cpu-tests/tests/load-store.c diff --git a/cpu-tests/tests/matrix-mul.c b/tests/cpu-tests/tests/matrix-mul.c similarity index 100% rename from cpu-tests/tests/matrix-mul.c rename to tests/cpu-tests/tests/matrix-mul.c diff --git a/cpu-tests/tests/max.c b/tests/cpu-tests/tests/max.c similarity index 100% rename from cpu-tests/tests/max.c rename to tests/cpu-tests/tests/max.c diff --git a/cpu-tests/tests/min3.c b/tests/cpu-tests/tests/min3.c similarity index 100% rename from cpu-tests/tests/min3.c rename to tests/cpu-tests/tests/min3.c diff --git a/cpu-tests/tests/mov-c.c b/tests/cpu-tests/tests/mov-c.c similarity index 100% rename from cpu-tests/tests/mov-c.c rename to tests/cpu-tests/tests/mov-c.c diff --git a/cpu-tests/tests/movsx.c b/tests/cpu-tests/tests/movsx.c similarity index 100% rename from cpu-tests/tests/movsx.c rename to tests/cpu-tests/tests/movsx.c diff --git a/cpu-tests/tests/mul-longlong.c b/tests/cpu-tests/tests/mul-longlong.c similarity index 100% rename from cpu-tests/tests/mul-longlong.c rename to tests/cpu-tests/tests/mul-longlong.c diff --git a/cpu-tests/tests/pascal.c b/tests/cpu-tests/tests/pascal.c similarity index 100% rename from cpu-tests/tests/pascal.c rename to tests/cpu-tests/tests/pascal.c diff --git a/cpu-tests/tests/prime.c b/tests/cpu-tests/tests/prime.c similarity index 100% rename from cpu-tests/tests/prime.c rename to tests/cpu-tests/tests/prime.c diff --git a/cpu-tests/tests/quick-sort.c b/tests/cpu-tests/tests/quick-sort.c similarity index 100% rename from cpu-tests/tests/quick-sort.c rename to tests/cpu-tests/tests/quick-sort.c diff --git a/cpu-tests/tests/recursion.c b/tests/cpu-tests/tests/recursion.c similarity index 100% rename from cpu-tests/tests/recursion.c rename to tests/cpu-tests/tests/recursion.c diff --git a/cpu-tests/tests/select-sort.c b/tests/cpu-tests/tests/select-sort.c similarity index 100% rename from cpu-tests/tests/select-sort.c rename to tests/cpu-tests/tests/select-sort.c diff --git a/cpu-tests/tests/shift.c b/tests/cpu-tests/tests/shift.c similarity index 100% rename from cpu-tests/tests/shift.c rename to tests/cpu-tests/tests/shift.c diff --git a/cpu-tests/tests/shuixianhua.c b/tests/cpu-tests/tests/shuixianhua.c similarity index 100% rename from cpu-tests/tests/shuixianhua.c rename to tests/cpu-tests/tests/shuixianhua.c diff --git a/cpu-tests/tests/string.c b/tests/cpu-tests/tests/string.c similarity index 100% rename from cpu-tests/tests/string.c rename to tests/cpu-tests/tests/string.c diff --git a/cpu-tests/tests/sub-longlong.c b/tests/cpu-tests/tests/sub-longlong.c similarity index 100% rename from cpu-tests/tests/sub-longlong.c rename to tests/cpu-tests/tests/sub-longlong.c diff --git a/cpu-tests/tests/sum.c b/tests/cpu-tests/tests/sum.c similarity index 100% rename from cpu-tests/tests/sum.c rename to tests/cpu-tests/tests/sum.c diff --git a/cpu-tests/tests/switch.c b/tests/cpu-tests/tests/switch.c similarity index 100% rename from cpu-tests/tests/switch.c rename to tests/cpu-tests/tests/switch.c diff --git a/cpu-tests/tests/to-lower-case.c b/tests/cpu-tests/tests/to-lower-case.c similarity index 100% rename from cpu-tests/tests/to-lower-case.c rename to tests/cpu-tests/tests/to-lower-case.c diff --git a/cpu-tests/tests/unalign.c b/tests/cpu-tests/tests/unalign.c similarity index 100% rename from cpu-tests/tests/unalign.c rename to tests/cpu-tests/tests/unalign.c diff --git a/cpu-tests/tests/wanshu.c b/tests/cpu-tests/tests/wanshu.c similarity index 100% rename from cpu-tests/tests/wanshu.c rename to tests/cpu-tests/tests/wanshu.c