vasilito
5851974b20
Release fork infrastructure: - REDBEAR_RELEASE=0.1.1 with offline enforcement (fetch/distclean/unfetch blocked) - 195 BLAKE3-verified source archives in standard format - Atomic provisioning via provision-release.sh (staging + .complete sentry) - 5-phase improvement plan: restore format auto-detection, source tree validation (validate-source-trees.py), archive-map.json, REPO_BINARY fallback Archive normalization: - Removed 87 duplicate/unversioned archives from shared pool - Regenerated all archives in consistent format with source/ + recipe.toml - BLAKE3SUMS and manifest.json generated from stable tarball set Patch management: - verify-patches.sh: pre-sync dry-run report (OK/REVERSED/CONFLICT) - 121 upstream-absorbed patches moved to absorbed/ directories - 43 active patches verified clean against rebased sources - Stress test: base updated to upstream HEAD, relibc reset and patched Compilation fixes: - relibc: Vec imports in redox-rt (proc.rs, lib.rs, sys.rs) - relibc: unsafe from_raw_parts in mod.rs (2024 edition) - fetch.rs: rev comparison handles short/full hash prefixes - kibi recipe: corrected rev mismatch New scripts: restore-sources.sh, provision-release.sh, verify-sources-archived.sh, check-upstream-releases.sh, validate-source-trees.py, verify-patches.sh, repair-archive-format.sh, generate-manifest.py Documentation: AGENTS.md, README.md, local/AGENTS.md updated for release fork model
98 lines
3.1 KiB
Diff
98 lines
3.1 KiB
Diff
diff --git a/src/main.rs b/src/main.rs
|
|
index b2e2736..a6a9474 100644
|
|
--- a/src/main.rs
|
|
+++ b/src/main.rs
|
|
@@ -500,36 +500,63 @@ pub extern "C" fn main() -> ! {
|
|
|
|
print!("live: 0/{} MiB", size / MIBI as u64);
|
|
|
|
- let ptr = os.alloc_zeroed_page_aligned(size as usize);
|
|
- if ptr.is_null() {
|
|
- panic!("Failed to allocate memory for live");
|
|
- }
|
|
-
|
|
- let live = unsafe { slice::from_raw_parts_mut(ptr, size as usize) };
|
|
-
|
|
- let mut i = 0;
|
|
- for chunk in live.chunks_mut(MIBI) {
|
|
- print!("\rlive: {}/{} MiB", i / MIBI as u64, size / MIBI as u64);
|
|
- i += unsafe {
|
|
- fs.disk
|
|
- .read_at(fs.block + i / redoxfs::BLOCK_SIZE, chunk)
|
|
- .expect("Failed to read live disk") as u64
|
|
- };
|
|
- }
|
|
- println!("\rlive: {}/{} MiB", i / MIBI as u64, size / MIBI as u64);
|
|
-
|
|
- println!("Switching to live disk");
|
|
- unsafe {
|
|
- LIVE_OPT = Some((fs.block, slice::from_raw_parts_mut(ptr, size as usize)));
|
|
- }
|
|
+ let live_size = match usize::try_from(size) {
|
|
+ Ok(live_size) => live_size,
|
|
+ Err(_) => {
|
|
+ println!("\rlive: disabled (image too large for bootloader address space)");
|
|
+ live = false;
|
|
+ 0
|
|
+ }
|
|
+ };
|
|
|
|
- area_add(OsMemoryEntry {
|
|
- base: live.as_ptr() as u64,
|
|
- size: live.len() as u64,
|
|
- kind: OsMemoryKind::Reserved,
|
|
- });
|
|
+ let ptr = if live {
|
|
+ os.alloc_zeroed_page_aligned(live_size)
|
|
+ } else {
|
|
+ ptr::null_mut()
|
|
+ };
|
|
+
|
|
+ if live && ptr.is_null() {
|
|
+ println!(
|
|
+ "\rlive: disabled (unable to allocate {} MiB upfront)",
|
|
+ size / MIBI as u64
|
|
+ );
|
|
+ live = false;
|
|
+ }
|
|
+
|
|
+ let live = if live {
|
|
+ Some(unsafe { slice::from_raw_parts_mut(ptr, live_size) })
|
|
+ } else {
|
|
+ println!("Continuing without live preload");
|
|
+ None
|
|
+ };
|
|
+
|
|
+ if let Some(live) = live {
|
|
+ let mut i = 0;
|
|
+ for chunk in live.chunks_mut(MIBI) {
|
|
+ print!("\rlive: {}/{} MiB", i / MIBI as u64, size / MIBI as u64);
|
|
+ i += unsafe {
|
|
+ fs.disk
|
|
+ .read_at(fs.block + i / redoxfs::BLOCK_SIZE, chunk)
|
|
+ .expect("Failed to read live disk") as u64
|
|
+ };
|
|
+ }
|
|
+ println!("\rlive: {}/{} MiB", i / MIBI as u64, size / MIBI as u64);
|
|
+
|
|
+ println!("Switching to live disk");
|
|
+ unsafe {
|
|
+ LIVE_OPT = Some((fs.block, slice::from_raw_parts_mut(ptr, live_size)));
|
|
+ }
|
|
+
|
|
+ area_add(OsMemoryEntry {
|
|
+ base: live.as_ptr() as u64,
|
|
+ size: live.len() as u64,
|
|
+ kind: OsMemoryKind::Reserved,
|
|
+ });
|
|
+
|
|
+ Some(live)
|
|
+ } else {
|
|
+ None
|
|
+ }
|
|
-
|
|
- Some(live)
|
|
} else {
|
|
None
|
|
};
|