include: one folder per subsystem, and includes that name it
Sixty-five headers sat side by side in include/, so `#include "irq.h"` said nothing about where irq.h was or what it belonged to, and errno.h, stat.h and fcntl.h at the top shadowed the system's for any host tool built with -I./include. They are in folders now -- arch/ core/ fs/ dev/ gfx/ net/ uapi/ (and ldls/ for the Linux driver layer) -- and every include names the folder, as Linux's do: "core/proc.h". Done mechanically and checked the hard way: the kernel built from this tree disassembles identically to the one built from the tree before it. The full image boots, and userland is the same set of programs. Paths in docs and comments follow; docs/guides/layout.md has a table of what is where, and tools/fix-includes.py rewrites old-style includes from the folders in the tree, for code written before this. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S1giNvrHTrPMPw7V6x1kQ4
This commit is contained in:
parent
0e39e711f1
commit
a1c965da1e
267 changed files with 1560 additions and 1440 deletions
|
|
@ -26,25 +26,25 @@
|
|||
// what tools/bootcheck.ps1 reads, and it is what you get when the crash happens
|
||||
// before there is a framebuffer at all.
|
||||
|
||||
#include "types.h"
|
||||
#include "kbd.h"
|
||||
#include "x86.h"
|
||||
#include "defs.h"
|
||||
#include "gfx.h"
|
||||
#include "param.h"
|
||||
#include "memlayout.h"
|
||||
#include "mmu.h"
|
||||
#include "x86.h"
|
||||
#include "proc.h"
|
||||
#include "spinlock.h"
|
||||
#include "core/types.h"
|
||||
#include "dev/kbd.h"
|
||||
#include "arch/x86.h"
|
||||
#include "core/defs.h"
|
||||
#include "gfx/gfx.h"
|
||||
#include "core/param.h"
|
||||
#include "arch/memlayout.h"
|
||||
#include "arch/mmu.h"
|
||||
#include "arch/x86.h"
|
||||
#include "core/proc.h"
|
||||
#include "core/spinlock.h"
|
||||
// Purple, because the name says so, and white on it because nothing else is
|
||||
// legible at every brightness a monitor might be set to. The palette lives in
|
||||
// theme.h with everything else; this file used to keep its own copy under the
|
||||
// same names but with different values, which meant theme.h described a crash
|
||||
// screen nobody had ever seen.
|
||||
#include "theme.h"
|
||||
#include "logo.h" /* LOGO_H -- the mark's height, for the layout below */
|
||||
#include "qr.h"
|
||||
#include "gfx/theme.h"
|
||||
#include "gfx/logo.h" /* LOGO_H -- the mark's height, for the layout below */
|
||||
#include "gfx/qr.h"
|
||||
|
||||
extern uint ticks;
|
||||
extern int panicked;
|
||||
|
|
@ -431,7 +431,7 @@ paint(char *reason, addr_t *pcs, int npcs)
|
|||
if (y + LOGO_H + ch * 2 + body > foot)
|
||||
logo = 0;
|
||||
|
||||
// Shift, the system's own mark, from the same include/logo.h the loader
|
||||
// Shift, the system's own mark, from the same include/gfx/logo.h the loader
|
||||
// splash and the boot console draw. It replaces Guru, a chamfered face that
|
||||
// lived only here and was drawn from primitives a few lines up this file.
|
||||
//
|
||||
|
|
@ -494,7 +494,7 @@ paint(char *reason, addr_t *pcs, int npcs)
|
|||
//
|
||||
// What replaces it is the thing nobody would guess: **this screen is no
|
||||
// longer the only copy.** The log survives into the next boot (see
|
||||
// include/klog.h), so the right instruction on a crash screen is now
|
||||
// include/core/klog.h), so the right instruction on a crash screen is now
|
||||
// "restart and read it" rather than "photograph this".
|
||||
//
|
||||
// Kept under about 45 characters each: the QR card is on the right, and the
|
||||
|
|
|
|||
Loading…
Reference in a new issue