diff --git a/blk/001 b/blk/001 index feb2f30..635366a 100644 --- a/blk/001 +++ b/blk/001 @@ -7,6 +7,5 @@ MASTER INDEX 170-259 unused 260 Cross compilation 280 Z80 boot code 350 Core words 410 PS/2 keyboard subsystem 420 SD Card subsystem -440-519 unused 520 Fonts -550-799 unused -800 8086 boot code +440 8086 boot code +470-519 unused 520 Fonts diff --git a/blk/800 b/blk/440 similarity index 100% rename from blk/800 rename to blk/440 diff --git a/blk/801 b/blk/441 similarity index 93% rename from blk/801 rename to blk/441 index 1420823..73ae535 100644 --- a/blk/801 +++ b/blk/441 @@ -10,4 +10,4 @@ size of stack. This allows for some interesting optimization. For example, in SWAP, no need to pop, chkPS, then push, we can chkPS and then proceed to optimized swapping in PS. -To assemble, load blocks 805 through 820. +To assemble, load blocks 445 through 460 diff --git a/blk/805 b/blk/445 similarity index 100% rename from blk/805 rename to blk/445 diff --git a/blk/806 b/blk/446 similarity index 100% rename from blk/806 rename to blk/446 diff --git a/blk/807 b/blk/447 similarity index 100% rename from blk/807 rename to blk/447 diff --git a/blk/808 b/blk/448 similarity index 100% rename from blk/808 rename to blk/448 diff --git a/blk/809 b/blk/449 similarity index 100% rename from blk/809 rename to blk/449 diff --git a/blk/810 b/blk/450 similarity index 100% rename from blk/810 rename to blk/450 diff --git a/blk/811 b/blk/451 similarity index 100% rename from blk/811 rename to blk/451 diff --git a/blk/812 b/blk/452 similarity index 100% rename from blk/812 rename to blk/452 diff --git a/blk/813 b/blk/453 similarity index 100% rename from blk/813 rename to blk/453 diff --git a/blk/814 b/blk/454 similarity index 100% rename from blk/814 rename to blk/454 diff --git a/blk/815 b/blk/455 similarity index 100% rename from blk/815 rename to blk/455 diff --git a/blk/816 b/blk/456 similarity index 100% rename from blk/816 rename to blk/456 diff --git a/blk/817 b/blk/457 similarity index 100% rename from blk/817 rename to blk/457 diff --git a/blk/818 b/blk/458 similarity index 100% rename from blk/818 rename to blk/458 diff --git a/blk/819 b/blk/459 similarity index 100% rename from blk/819 rename to blk/459 diff --git a/blk/820 b/blk/460 similarity index 100% rename from blk/820 rename to blk/460 diff --git a/doc/usage.txt b/doc/usage.txt index 27b13a4..bea6278 100644 --- a/doc/usage.txt +++ b/doc/usage.txt @@ -109,12 +109,9 @@ try to strive towards a few goals: 1. Block 0 contains documentation discovery core keys to the uninitiated. 2. B1-B4 are for a master index of blocks. -3. B5-B199 are for runtime usage utilities -4. B200-B599 are for bootstrapping -5. The rest is for recipes. - -Blocks are currently not organized neatly. I'm planning the -extraction of recipes into some kind of block "overlays" that -would live in the recipes subfolder so each recipe would build -its own specific blkfs which would contain only its recipe code, -starting at B600. +3. B5-B259 are for programs loaded at runtime. +4. B260-B599 are for bootstrapping a new core. +5. B600-B650 are for recipes. + +Recipes blocks do not live in the main blkfs, but each recipe +has its own blkfs overlay, with blocks beginning at 600. diff --git a/recipes/pcat/blk/612 b/recipes/pcat/blk/612 index 83c2a44..0bfb8c8 100644 --- a/recipes/pcat/blk/612 +++ b/recipes/pcat/blk/612 @@ -3,7 +3,7 @@ RS_ADDR 0x80 - CONSTANT SYSVARS 30 LOAD ( 8086 asm ) 262 LOAD ( xcomp ) 270 LOAD ( xcomp overrides ) -805 820 LOADR ( 8086 boot code ) +445 460 LOADR ( 8086 boot code ) 353 LOAD ( xcomp core low ) 604 LOAD ( KEY/EMIT drivers ) 606 608 LOADR ( BLK drivers )