From 71e4f3812982dba2efb471283d310224e8db363e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 3 Mar 2021 22:09:50 -0800 Subject: 7842 - new directory organization Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at. --- tools/iso/kernel.soso/debugprint.c | 79 -------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 tools/iso/kernel.soso/debugprint.c (limited to 'tools/iso/kernel.soso/debugprint.c') diff --git a/tools/iso/kernel.soso/debugprint.c b/tools/iso/kernel.soso/debugprint.c deleted file mode 100644 index 186bc89f..00000000 --- a/tools/iso/kernel.soso/debugprint.c +++ /dev/null @@ -1,79 +0,0 @@ -#include "debugprint.h" -#include "common.h" -#include "fs.h" - -static File* gFile = NULL; - -void Debug_initialize(const char* fileName) { - FileSystemNode* node = getFileSystemNode(fileName); - - gFile = open_fs(node, 0); -} - -void Debug_PrintF(const char *format, ...) { - char **arg = (char **) &format; - char c; - char buf[20]; - char buffer[512]; - - int bufferIndex = 0; - - //arg++; - __builtin_va_list vl; - __builtin_va_start(vl, format); - - while ((c = *format++) != 0) { - if (bufferIndex > 510) { - break; - } - - if (c != '%') - buffer[bufferIndex++] = c; - else { - char *p; - - c = *format++; - switch (c) { - case 'x': - buf[0] = '0'; - buf[1] = 'x'; - //itoa (buf + 2, c, *((int *) arg++)); - itoa (buf + 2, c, __builtin_va_arg(vl, int)); - p = buf; - goto string; - break; - case 'd': - case 'u': - //itoa (buf, c, *((int *) arg++)); - itoa (buf, c, __builtin_va_arg(vl, int)); - p = buf; - goto string; - break; - - case 's': - //p = *arg++; - p = __builtin_va_arg(vl, char*); - if (! p) - p = "(null)"; - - string: - while (*p) - buffer[bufferIndex++] = (*p++); - break; - - default: - //buffer[bufferIndex++] = (*((int *) arg++)); - buffer[bufferIndex++] = __builtin_va_arg(vl, int); - break; - } - } - } - - buffer[bufferIndex] = '\0'; - - if (gFile) { - write_fs(gFile, strlen(buffer), (uint8*)buffer); - } - - __builtin_va_end(vl); -} -- cgit 1.4.1-2-gfad0