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. --- 312copy.subx | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) (limited to '312copy.subx') diff --git a/312copy.subx b/312copy.subx index 11bfbc3e..d2a6f661 100644 --- a/312copy.subx +++ b/312copy.subx @@ -11,58 +11,3 @@ $copy-array-object:end: 89/<- %esp 5/r32/ebp 5d/pop-to-ebp c3/return - -# create an independent copy of file src into dest -# there's no way to do this without knowing the filename -copy-file: # src: (addr buffered-file), dest-ah: (addr handle buffered-file), filename: (addr array byte) - # . prologue - 55/push-ebp - 89/<- %ebp 4/r32/esp - # . save registers - 50/push-eax - 51/push-ecx - 52/push-edx - 53/push-ebx - 56/push-esi - 57/push-edi - # esi = src - 8b/-> *(ebp+8) 6/r32/esi - # var n/ecx: int = src->buffer->size + 16 - 8b/-> *(esi+0xc) 0/r32/eax - 05/add-to-eax 0x10/imm32 # buffered-file fields before buffer contents - 89/<- %ecx 0/r32/eax - # - (allocate Heap %ecx *(ebp+0xc)) - # var dest/edi: (addr buffered-file) = lookup(*dest-ah) - 8b/-> *(ebp+0xc) 0/r32/eax - (lookup *eax *(eax+4)) # => eax - 89/<- %edi 0/r32/eax - # - (copy-bytes %esi %edi %ecx) - # var offset/ecx: int = lseek(src->fd, 0, SEEK_CUR) - 8b/-> *esi 3/r32/ebx - b9/copy-to-ecx 0/imm32/offset - ba/copy-to-edx 1/imm32/whence:SEEK_CUR - (syscall_lseek) - 89/<- %ecx 0/r32/eax - # at this point dest is identical to src, including file descriptor. Now - # create an independent copy of the file descriptor - (open-fd *(ebp+0x10) 0) # false => eax - 89/<- *edi 0/r32/eax - # replicate offset in the new fd - 89/<- %ebx 0/r32/eax # fd - 51/push-ecx # offset - ba/copy-to-edx 0/imm32/whence:SEEK_SET - (syscall_lseek) -$copy-file:end: - # . restore registers - 5f/pop-to-edi - 5e/pop-to-esi - 5b/pop-to-ebx - 5a/pop-to-edx - 59/pop-to-ecx - 58/pop-to-eax - # . epilogue - 89/<- %esp 5/r32/ebp - 5d/pop-to-ebp - c3/return -- cgit 1.4.1-2-gfad0