From 2523ad0911a18d63ff9a4517b7f50076dd3ea9f5 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 May 2023 06:38:49 +0300 Subject: [PATCH] Update echo program --- apps/base/echo/Makefile | 2 +- apps/base/echo/echo.cpp | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/base/echo/Makefile b/apps/base/echo/Makefile index d8d7ee7..5bccaed 100644 --- a/apps/base/echo/Makefile +++ b/apps/base/echo/Makefile @@ -56,7 +56,7 @@ endif build: $(FILENAME) $(OBJDUMP) -d $(FILENAME) > file_dump.map - mv $(FILENAME) ../../../out/system/$(FILENAME) + mv $(FILENAME) ../../../out/system/bin/$(FILENAME) $(FILENAME): $(OBJ) $(info Linking $@) diff --git a/apps/base/echo/echo.cpp b/apps/base/echo/echo.cpp index cdb25a2..e515479 100644 --- a/apps/base/echo/echo.cpp +++ b/apps/base/echo/echo.cpp @@ -1,21 +1,11 @@ -static inline long syscall2(int sc, long arg1, long arg2) -{ - long ret; - __asm__ __volatile__("syscall" - : "=a"(ret) - : "a"(sc), "D"(arg1), "S"(arg2) - : "rcx", "r11", "memory"); - return ret; -} +#include int main(int argc, char *argv[]) { - // TODO: Change this to use stdout for (int i = 1; i < argc; i++) { - for (int j = 0; argv[i][j]; j++) - syscall2(1, argv[i][j], 0); - syscall2(1, ' ', 0); + printf("%s ", argv[i]); } + printf("\n"); return 0; }