From bf94fe6028d4499933516707e2d8f4e7a8933246 Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Mon, 1 Apr 2024 00:47:34 +0000 Subject: [PATCH] Move non-VM related code and utilities to a base library instead. --- nanocoat/lib/3rdparty/lua/CMakeLists.txt | 4 ++-- nanocoat/lib/base/CMakeLists.txt | 23 +++++++++++++++++++++++ nanocoat/{src => lib/base}/alloc.c | 0 nanocoat/{src => lib/base}/allocSizeOf.c | 0 nanocoat/{src => lib/base}/atomic.c | 0 nanocoat/{src => lib/base}/comparator.c | 0 nanocoat/{src => lib/base}/debug.c | 0 nanocoat/{src => lib/base}/dylib.c | 0 nanocoat/{src => lib/base}/error.c | 0 nanocoat/{src => lib/base}/except.c | 0 nanocoat/{src => lib/base}/list.c | 0 nanocoat/{src => lib/base}/recycle.c | 0 nanocoat/{src => lib/base}/refcount.c | 0 nanocoat/{src => lib/base}/seekable.c | 0 nanocoat/{src => lib/base}/stream.c | 0 nanocoat/{src => lib/base}/tree.c | 12 ++++++++++++ nanocoat/{src => lib/base}/util.c | 10 ---------- nanocoat/{src => lib/base}/zip.c | 0 nanocoat/src/CMakeLists.txt | 18 +----------------- nanocoat/tests/CMakeLists.txt | 2 ++ 20 files changed, 40 insertions(+), 29 deletions(-) rename nanocoat/{src => lib/base}/alloc.c (100%) rename nanocoat/{src => lib/base}/allocSizeOf.c (100%) rename nanocoat/{src => lib/base}/atomic.c (100%) rename nanocoat/{src => lib/base}/comparator.c (100%) rename nanocoat/{src => lib/base}/debug.c (100%) rename nanocoat/{src => lib/base}/dylib.c (100%) rename nanocoat/{src => lib/base}/error.c (100%) rename nanocoat/{src => lib/base}/except.c (100%) rename nanocoat/{src => lib/base}/list.c (100%) rename nanocoat/{src => lib/base}/recycle.c (100%) rename nanocoat/{src => lib/base}/refcount.c (100%) rename nanocoat/{src => lib/base}/seekable.c (100%) rename nanocoat/{src => lib/base}/stream.c (100%) rename nanocoat/{src => lib/base}/tree.c (69%) rename nanocoat/{src => lib/base}/util.c (97%) rename nanocoat/{src => lib/base}/zip.c (100%) diff --git a/nanocoat/lib/3rdparty/lua/CMakeLists.txt b/nanocoat/lib/3rdparty/lua/CMakeLists.txt index c5da0ff971..bdfc08ffe7 100644 --- a/nanocoat/lib/3rdparty/lua/CMakeLists.txt +++ b/nanocoat/lib/3rdparty/lua/CMakeLists.txt @@ -36,8 +36,8 @@ squirreljme_multilib_add_library(3rdPartyLua ltable.c ltablib.c ltm.c - lua.c - luac.c + #lua.c -- main program we can ignore + #luac.c -- main program we can ignore lundump.c lutf8lib.c lvm.c diff --git a/nanocoat/lib/base/CMakeLists.txt b/nanocoat/lib/base/CMakeLists.txt index 3a3837f07d..185febcd26 100644 --- a/nanocoat/lib/base/CMakeLists.txt +++ b/nanocoat/lib/base/CMakeLists.txt @@ -5,3 +5,26 @@ # SquirrelJME is under the Mozilla Public License Version 2.0. # See license.mkd for licensing and copyright information. # --------------------------------------------------------------------------- + +# Declare Base library +squirreljme_multilib_add_library(Base + alloc.c + allocSizeOf.c + atomic.c + comparator.c + debug.c + dylib.c + error.c + except.c + list.c + recycle.c + refcount.c + seekable.c + stream.c + tree.c + util.c + zip.c) + +# Include main headers +squirreljme_multilib_target_include_directories(Base + "${CMAKE_SOURCE_DIR}/include") diff --git a/nanocoat/src/alloc.c b/nanocoat/lib/base/alloc.c similarity index 100% rename from nanocoat/src/alloc.c rename to nanocoat/lib/base/alloc.c diff --git a/nanocoat/src/allocSizeOf.c b/nanocoat/lib/base/allocSizeOf.c similarity index 100% rename from nanocoat/src/allocSizeOf.c rename to nanocoat/lib/base/allocSizeOf.c diff --git a/nanocoat/src/atomic.c b/nanocoat/lib/base/atomic.c similarity index 100% rename from nanocoat/src/atomic.c rename to nanocoat/lib/base/atomic.c diff --git a/nanocoat/src/comparator.c b/nanocoat/lib/base/comparator.c similarity index 100% rename from nanocoat/src/comparator.c rename to nanocoat/lib/base/comparator.c diff --git a/nanocoat/src/debug.c b/nanocoat/lib/base/debug.c similarity index 100% rename from nanocoat/src/debug.c rename to nanocoat/lib/base/debug.c diff --git a/nanocoat/src/dylib.c b/nanocoat/lib/base/dylib.c similarity index 100% rename from nanocoat/src/dylib.c rename to nanocoat/lib/base/dylib.c diff --git a/nanocoat/src/error.c b/nanocoat/lib/base/error.c similarity index 100% rename from nanocoat/src/error.c rename to nanocoat/lib/base/error.c diff --git a/nanocoat/src/except.c b/nanocoat/lib/base/except.c similarity index 100% rename from nanocoat/src/except.c rename to nanocoat/lib/base/except.c diff --git a/nanocoat/src/list.c b/nanocoat/lib/base/list.c similarity index 100% rename from nanocoat/src/list.c rename to nanocoat/lib/base/list.c diff --git a/nanocoat/src/recycle.c b/nanocoat/lib/base/recycle.c similarity index 100% rename from nanocoat/src/recycle.c rename to nanocoat/lib/base/recycle.c diff --git a/nanocoat/src/refcount.c b/nanocoat/lib/base/refcount.c similarity index 100% rename from nanocoat/src/refcount.c rename to nanocoat/lib/base/refcount.c diff --git a/nanocoat/src/seekable.c b/nanocoat/lib/base/seekable.c similarity index 100% rename from nanocoat/src/seekable.c rename to nanocoat/lib/base/seekable.c diff --git a/nanocoat/src/stream.c b/nanocoat/lib/base/stream.c similarity index 100% rename from nanocoat/src/stream.c rename to nanocoat/lib/base/stream.c diff --git a/nanocoat/src/tree.c b/nanocoat/lib/base/tree.c similarity index 69% rename from nanocoat/src/tree.c rename to nanocoat/lib/base/tree.c index 3648f539dd..c9ca683fe0 100644 --- a/nanocoat/src/tree.c +++ b/nanocoat/lib/base/tree.c @@ -8,3 +8,15 @@ // -------------------------------------------------------------------------*/ #include "sjme/tree.h" +#include "sjme/debug.h" +#include "sjme/util.h" + +sjme_jint sjme_tree_find(void* in, void* what, + const sjme_tree_findFunc* functions) +{ + if (in == NULL || functions == NULL) + return -1; + + sjme_todo("sjme_tree_find()"); + return -1; +} diff --git a/nanocoat/src/util.c b/nanocoat/lib/base/util.c similarity index 97% rename from nanocoat/src/util.c rename to nanocoat/lib/base/util.c index 406050d5f1..f7764d2414 100644 --- a/nanocoat/src/util.c +++ b/nanocoat/lib/base/util.c @@ -328,13 +328,3 @@ sjme_jint sjme_string_lengthN(sjme_lpcstr string, sjme_jint limit) /* Use whatever length we found. */ return result; } - -sjme_jint sjme_tree_find(void* in, void* what, - const sjme_tree_findFunc* functions) -{ - if (in == NULL || functions == NULL) - return -1; - - sjme_todo("sjme_tree_find()"); - return -1; -} diff --git a/nanocoat/src/zip.c b/nanocoat/lib/base/zip.c similarity index 100% rename from nanocoat/src/zip.c rename to nanocoat/lib/base/zip.c diff --git a/nanocoat/src/CMakeLists.txt b/nanocoat/src/CMakeLists.txt index d7d1a600d0..192fd4f1b0 100644 --- a/nanocoat/src/CMakeLists.txt +++ b/nanocoat/src/CMakeLists.txt @@ -8,37 +8,21 @@ # Declare library squirreljme_multilib_add_library(Core - alloc.c - allocSizeOf.c - atomic.c boot.c bytecode.c classy.c - comparator.c - debug.c descriptor.c - dylib.c - error.c - except.c gfx.c jdwp.c - list.c loop.c modelessStars.c multithread.c native.c nvm.c - recycle.c - refcount.c rom.c - seekable.c - stream.c task.c tread.c - tree.c - util.c - vmConfig.c - zip.c) + vmConfig.c) # Include main headers squirreljme_multilib_target_include_directories(Core diff --git a/nanocoat/tests/CMakeLists.txt b/nanocoat/tests/CMakeLists.txt index 9176e0d524..a0f28fc530 100644 --- a/nanocoat/tests/CMakeLists.txt +++ b/nanocoat/tests/CMakeLists.txt @@ -17,6 +17,7 @@ squirreljme_sourceize_dir("${CMAKE_CURRENT_BINARY_DIR}/blobs/binary" # Setup main test execution wrapper which runs within TAC add_library(TACTestExecutorCore STATIC + $ $ src/tac.c) @@ -74,6 +75,7 @@ add_library(BasicTestLibPIC OBJECT # Initialize executable for basic tests, which contains everything add_executable(BasicTest src/basicMain.c + $ $ $) -- 2.11.4.GIT