refactored for architectures and added riscv support

This commit is contained in:
Bryan McShea
2024-01-24 00:41:51 -05:00
parent e5a6b6073f
commit 461269ed32
30 changed files with 683 additions and 425 deletions

63
runner/src/main.rs Normal file
View File

@@ -0,0 +1,63 @@
use clap::Parser;
use std::process::{self, Command, Stdio};
use target::Target;
mod boot;
mod target;
#[derive(Parser)]
#[command(author, version, about, long_about = None)]
struct Args {
/// what architecture / machine to target
#[command(subcommand)]
target: Option<Target>,
/// whether to use gdb
#[arg(long, short, id = "port")]
gdb: Option<Option<u16>>,
}
fn main() {
let args = Args::parse();
let target = args.target.unwrap_or(Target::default());
std::env::set_current_dir("../kernel").expect("uh oh");
build(&target);
run_qemu(&target, args.gdb);
}
fn run_qemu(target: &Target, gdb: Option<Option<u16>>) {
let mut qemu = target.qemu();
if let Some(port) = gdb {
let port = port.unwrap_or(1234);
qemu.arg("-S");
qemu.args(["-gdb", &format!("tcp::{}", port)]);
let mut gdb = target.gdb();
gdb.arg("-q");
gdb.args(["-ex", &format!("target remote :{}", port)]);
// gdb.args(["-ex", "b kernel::kernel_main"]);
// gdb.args(["-ex", "c"]);
let handle = std::thread::spawn(move || {
qemu.stdin(Stdio::null());
qemu.stdout(Stdio::null());
let exit_status = qemu.status().unwrap();
});
gdb.status().unwrap();
handle.join().unwrap();
} else {
let exit_status = qemu.status().unwrap();
// process::exit(exit_status.code().unwrap_or(-1));
}
}
fn build(target: &Target) {
let mut cargo = Command::new("cargo");
cargo.arg("build");
cargo.args(["--package", "kernel"]);
cargo.args(["--target", target.rust_target()]);
let status = cargo.status().expect("uh oh");
if !status.success() {
process::exit(status.code().unwrap_or(-1));
}
if let Target::X86_64 { bootloader } = target {
boot::build_bootloader_img(bootloader);
}
}