add app dir and simple app

Author: tas0dev

.vscode/settings.json

@@ -18,5 +18,8 @@
     "[c]": {
             "editor.tabSize": 8,
             "editor.formatOnSave": true,
-    },
+},
+"files.associations": {
+        "memory.h": "c"
+},
 }

Makefile

@@ -41,7 +41,12 @@ USER_SOURCES = $(shell find $(SRC_USER) -name "*.c" \! -name "syscall.c")
 USER_OBJECTS = $(shell printf "%s\n" $(patsubst $(SRC_USER)/%.c, $(OUT_DIR)/usr/%.o, $(USER_SOURCES)) | sort -u)
 USER_ELFS = $(shell printf "%s\n" $(patsubst $(SRC_USER)/%.c, $(OUT_DIR)/usr/%.elf, $(USER_SOURCES)) | sort -u)
 
+## Determine apps source directory: prefer repo-root 'apps' if present, otherwise 'src/apps'
+ifeq ($(wildcard apps),apps)
 SRC_APPS = apps
+else
+SRC_APPS = $(SRC_DIR)/apps
+endif
 APP_OUT_DIR = $(OUT_DIR)/apps
 APP_SOURCES = $(shell if [ -d "$(SRC_APPS)" ]; then find $(SRC_APPS) -name "*.c"; fi)
 APP_OBJECTS = $(shell printf "%s\n" $(patsubst $(SRC_APPS)/%.c, $(APP_OUT_DIR)/%.o, $(APP_SOURCES)) | sort -u)
@@ -121,28 +126,29 @@ $(APP_OUT_DIR)/%.o: $(SRC_APPS)/%.c
 	@$(CC) $(CFLAGS) -D_FORTIFY_SOURCE=0 -fno-builtin -I$(BIN_LIB_DIR)/targ-include -c $< -o $@
 
 
+# Build a small syscall shim for apps so newlib's syscalls/_sbrk/_exit etc
+# resolve to int 0x80 stubs implemented in src/user/syscall.c
+$(APP_OUT_DIR)/syscall.o: $(SRC_USER)/syscall.c
+	@mkdir -p $(dir $@)
+	@$(CC) $(CFLAGS) -D_FORTIFY_SOURCE=0 -fno-builtin -I$(BIN_LIB_DIR)/targ-include -c $< -o $@
+
+
 user: lib $(ALL_USER_ELFS) $(APP_ELFS)
 	@echo "Built user ELFs: $(ALL_USER_ELFS)"
 
 
 
-$(APP_OUT_DIR)/%.elf: $(APP_OUT_DIR)/%.o
+
+$(APP_OUT_DIR)/%.elf: $(APP_OUT_DIR)/%.o $(APP_OUT_DIR)/syscall.o
 	@mkdir -p $(dir $@)
 	@echo "Linking app ELF: $@"
 	@if [ -f "$(BIN_LIB_DIR)/libc.a" ]; then \
-		$(CC) -nostdlib -static $< $(USER_LDFLAGS) -o $@; \
+		$(CC) -nostdlib -static $^ $(USER_LDFLAGS) -o $@; \
 	else \
-		$(CC) -nostdlib -static $< -o $@; \
+		$(CC) -nostdlib -static $^ -o $@; \
 	fi
 
-$(OUT_DIR)/user/%.elf: $(OUT_DIR)/user/%.o
-	@mkdir -p $(dir $@)
-	@echo "Linking user ELF: $@"
-	@if [ -f "$(BIN_LIB_DIR)/libc.a" ]; then \
-		$(CC) -nostdlib -static $< $(USER_LDFLAGS) -o $@; \
-	else \
-		$(CC) -nostdlib -static $< -o $@; \
-	fi
+
 
 
 $(OUT_DIR)/usr/hello.elf: $(OUT_DIR)/usr/hello.o $(OUT_DIR)/usr/syscall.o
@@ -196,19 +202,30 @@ $(ESP_IMG): $(BOOTX64) $(KERNEL)
 $(EXT2_IMG): $(KERNEL)
 	@rm -f $(EXT2_IMG)
 	@echo "Creating FAT16 filesystem image..."
+	@rm -rf bin/fs_tmp || true
 	@mkdir -p bin/fs_tmp/kernel/fonts
 	@mkdir -p bin/fs_tmp/usr
 	@mkdir -p bin/fs_tmp/apps
 	@mkdir -p bin/fs_tmp/lib
 	@cp -f $(FONTS) bin/fs_tmp/kernel/fonts/ 2>/dev/null || true
-	@cp -f bin/usr/*.elf bin/fs_tmp/usr/ 2>/dev/null || true
-	@cp -f bin/apps/*.elf bin/fs_tmp/apps/ 2>/dev/null || true
+	@mkdir -p bin/fs_tmp/usr
+	@# remove stale user/app ELFs in bin to avoid leftover artifacts
+	@rm -f bin/usr/*.elf 2>/dev/null || true
+	@rm -f bin/apps/*.elf 2>/dev/null || true
+	@# copy only the ELFs we built (USER_ELFS and APP_ELFS)
+	@for f in $(USER_ELFS); do \
+		if [ -f "$$f" ]; then cp -f "$$f" bin/fs_tmp/usr/; fi; \
+	done || true
+	@for f in $(APP_ELFS); do \
+		if [ -f "$$f" ]; then cp -f "$$f" bin/fs_tmp/apps/; fi; \
+	done || true
 	@cp -f bin/lib/* bin/fs_tmp/lib/ 2>/dev/null || true
 	@find bin -type f \
 		-not -name "*.o" \
 		-not -name "fs.img" \
 		-not -path "bin/fs_tmp/*" \
 		-not -path "bin/usr/*" \
+		-not -path "bin/user/*" \
 		-exec bash -c 'dest="bin/fs_tmp/$${1#bin/}"; mkdir -p "$$(dirname "$$dest")"; cp "$$1" "$$dest"' _ {} \;
 	@mkdir -p bin/fs_tmp
 	@cp README.md bin/fs_tmp/README.md 2>/dev/null || true

src/apps/hello.c

@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main() {
+	printf("Hello, world!\n");
+	printf("This application is LiteCore's first app!\n");
+
+	size_t len = 64;
+	char *buf = malloc(len);
+	if (!buf) {
+		printf("malloc failed\n");
+		return 1;
+	}
+	snprintf(buf, len, "Allocated %zu bytes at %p", len, (void *)buf);
+	printf("%s\n", buf);
+
+	size_t newlen = 128;
+	char *tmp = realloc(buf, newlen);
+	if (!tmp) {
+		printf("realloc failed, freeing original buffer\n");
+		free(buf);
+		return 1;
+	}
+	buf = tmp;
+	size_t used = strlen(buf);
+	snprintf(buf + used, newlen - used, " (resized)");
+	printf("%s\n", buf);
+
+	free(buf);
+	buf = NULL;
+	printf("Memory freed\n");
+
+	printf("Goodbye! ;)\n");
+
+	return 0;
+}

src/kernel/main.c

@@ -56,10 +56,6 @@ void kmain(BOOT_INFO *boot_info) {
 	new_line();
 	printk("====== TESTS ======\n");
 	run_test();
-
-	// マルチタスクテストを実行
-	new_line();
-	multi_task_test();
 #endif /* TEST_TRUE */
 
 	new_line();

src/kernel/shell/extended_commands.c

@@ -627,16 +627,14 @@ static int cmd_run(int argc, char **argv) {
 			uint8_t *dst = (uint8_t *)(uintptr_t)frame_virt;
 			/* calculate portion of file that maps into this page */
 			uint32_t page_va = dest_virt;
-			uint64_t copy_from;
 			if (page_va + 0x1000 <= vaddr) {
 				/* page before file data start */
-				copy_from = 0;
+				uint64_t copy_from = 0;
 			}
 			/* For simplicity, copy relevant bytes: */
 			uint64_t seg_file_end = off + filesz;
-			uint64_t src_off;
 			if ((uint64_t)page_va + 0x1000 <= vaddr) {
-				src_off = 0; /* nothing from file */
+				uint64_t src_off = 0; /* nothing from file */
 			} else {
 				/* overlapping region */
 				uint64_t file_page_offset = 0;

src/kernel/task/multi_task.c

@@ -27,14 +27,13 @@ static int scheduler_enabled = 0;
 // idle タスク（常に実行可能）
 static task_t idle_task;
 
-/**
- * @brief idleタスクのエントリポイント
- */
+/*
 static void idle_task_entry(void) {
 	while (1) {
 		asm volatile("hlt");
 	}
 }
+*/
 
 /**
  * @brief 文字列コピー（簡易実装）

src/kernel/util/console.c

@@ -305,7 +305,6 @@ void new_line() {
  * @brief 位置文字表示
  */
 static void console_putc(char ch) {
-	uint8_t attr = COLOR;
 
 	if (ch == '\n') {
 		new_line();

tools/fmt.sh

@@ -1 +1 @@
-find src/kernel src/user boot -type f \( -name "*.c" -o -name "*.h" \) -exec clang-format -i {} +
+find src/kernel src/user src/apps boot -type f \( -name "*.c" -o -name "*.h" \) -exec clang-format -i {} +