merge: resolve conflict in README.md

This commit is contained in:
Faynot
2026-06-23 22:52:59 +03:00

View File

@@ -128,28 +128,26 @@ make run KARCH=aarch64
## Development Plan (TODO) ## Development Plan (TODO)
### Detailed Task List | # | Task | Subtasks | Priority | Dependencies |
|---|------|----------|----------|--------------|
| # | Task | Subtasks | Priority | Dependencies | | 1 | **Descriptor memory model** | | High | PMM, VMM |
| --- | --------------------------- | ---------------------------------- | -------- | ------------ | | | | 1.1. `MemoryObject` structure | | |
| 1 | **Descriptor memory model** | | High | PMM, VMM | | | | 1.2. Descriptor table per process | | |
| | | 1.1. `MemoryObject` structure | | | | | | 1.3. Refcounting (strong/weak) | | |
| | | 1.2. Descriptor table per process | | | | | | 1.4. Syscalls: `allocate`, `clone` | | |
| | | 1.3. Refcounting (strong/weak) | | | | 2 | **Processes** | | High | Descriptors |
| | | 1.4. Syscalls: `allocate`, `clone` | | | | | | 2.1. PCB structure | | |
| 2 | **Processes** | | High | Descriptors | | | | 2.2. Descriptor Table per process | | |
| | | 2.1. PCB structure | | | | | | 2.3. Auto-cleanup on exit | | |
| | | 2.2. Descriptor Table per process | | | | 3 | **Syscalls API** | | Medium | Processes |
| | | 2.3. Auto-cleanup on exit | | | | | | 3.1. `transfer(desc, target)` | | |
| 3 | **Syscalls API** | | Medium | Processes | | | | 3.2. `borrow(desc, duration)` | | |
| | | 3.1. `transfer(desc, target)` | | | | | | 3.3. `release(desc)` | | |
| | | 3.2. `borrow(desc, duration)` | | | | 4 | **MMU Integration** | | Medium | Syscalls |
| | | 3.3. `release(desc)` | | | | | | 4.1. Page table per process | | |
| 4 | **MMU Integration** | | Medium | Syscalls | | | | 4.2. Mapping by descriptors | | |
| | | 4.1. Page table per process | | | | | | 4.3. Unmapping on release | | |
| | | 4.2. Mapping by descriptors | | | | 5 | **Circular references** | | Low | All above |
| | | 4.3. Unmapping on release | | |
| 5 | **Circular references** | | Low | All above |
## Debugging ## Debugging