From 8ce3173c3d5d066e83d2be668c85b7d834e56802 Mon Sep 17 00:00:00 2001 From: WangRunji Date: Sat, 28 Apr 2018 10:40:31 +0800 Subject: [PATCH] Link a user program from xv6-x86_64 in. Add elf crate. --- Cargo.toml | 2 ++ Makefile | 8 ++++++++ src/arch/x86_64/boot/linker.ld | 10 ++++++++++ src/lib.rs | 1 + src/process/mod.rs | 25 +++++++++++++++++++++++++ src/process/process.rs | 14 ++++++++++++++ user/forktest.o | Bin 0 -> 11817 bytes 7 files changed, 60 insertions(+) create mode 100755 user/forktest.o diff --git a/Cargo.toml b/Cargo.toml index ace384d..57c18cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ crate-type = ["staticlib"] use_apic = [] test = [] qemu_auto_exit = [] +link_user_program = [] [dependencies] bit_field = "0.7.0" @@ -22,6 +23,7 @@ x86_64 = "0.1.2" once = "0.3.3" linked_list_allocator = "0.5.0" redox_syscall = "0.1.37" +xmas-elf = "0.6" [build-dependencies] cc = "1.0" diff --git a/Makefile b/Makefile index 142db7c..f3c31ae 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,17 @@ grub_cfg := $(boot_src)/grub.cfg assembly_source_files := $(wildcard $(boot_src)/*.asm) assembly_object_files := $(patsubst $(boot_src)/%.asm, \ build/arch/$(arch)/boot/%.o, $(assembly_source_files)) +user_object_files := $(wildcard user/*.o) qemu_opts := -cdrom $(iso) -smp 4 -serial mon:stdio features := use_apic +link_user = 1 + +ifdef link_user +features := $(features) link_user_program +assembly_object_files := $(assembly_object_files) $(user_object_files) +endif + ifdef travis test := 1 features := $(features) qemu_auto_exit diff --git a/src/arch/x86_64/boot/linker.ld b/src/arch/x86_64/boot/linker.ld index f2f23f9..f43f4ec 100644 --- a/src/arch/x86_64/boot/linker.ld +++ b/src/arch/x86_64/boot/linker.ld @@ -6,6 +6,8 @@ KERNEL_OFFSET = 0xffffff0000000000; SECTIONS { + /* bootloader for first processor */ + . = BOOT_OFFSET; .rodata.32 : @@ -39,8 +41,16 @@ SECTIONS { entryother_end = . - OTHER_OFFSET + entryother_start; . = entryother_end; /* recover va */ + /* kernel */ + . += KERNEL_OFFSET; + .user ALIGN(4K): AT(ADDR(.user) - KERNEL_OFFSET) + { + KEEP(user/*.o (.data)) + . = ALIGN(4K); + } + .rodata : AT(ADDR(.rodata) - KERNEL_OFFSET) { *(.rodata .rodata.*) diff --git a/src/lib.rs b/src/lib.rs index 9e4cd4c..d7a881a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,6 +32,7 @@ extern crate linked_list_allocator; extern crate lazy_static; extern crate bit_field; extern crate syscall; +extern crate xmas_elf; #[macro_use] // print! mod io; diff --git a/src/process/mod.rs b/src/process/mod.rs index 76beeef..80e5f70 100644 --- a/src/process/mod.rs +++ b/src/process/mod.rs @@ -14,11 +14,36 @@ mod processor; /// * Debug: 用于Debug输出 use arch::interrupt::TrapFrame; +// TODO: 使用宏来更优雅地导入符号，现在会有编译错误 +// +// #![feature(concat_idents)] +// +// macro_rules! binary_symbol { +// ($name: ident) => { +// extern { +// fn concat_idents!(_binary_user_, $name, _start)(); +// fn concat_idents!(_binary_user_, $name, _end)(); +// } +// }; +// } +// +// binary_symbol!(forktest); + +#[cfg(feature = "link_user_program")] +extern { + fn _binary_user_forktest_start(); + fn _binary_user_forktest_end(); +} + + pub fn init(mc: &mut MemoryController) { PROCESSOR.call_once(|| {Mutex::new({ let mut processor = Processor::new(mc); let initproc = Process::new_init(mc); let idleproc = Process::new("idle", idle_thread, mc); + #[cfg(feature = "link_user_program")] + let forktest = Process::new_user(_binary_user_forktest_start as usize, + _binary_user_forktest_end as usize); processor.add(initproc); processor.add(idleproc); processor diff --git a/src/process/process.rs b/src/process/process.rs index 5e95e66..ae5539d 100644 --- a/src/process/process.rs +++ b/src/process/process.rs @@ -1,5 +1,7 @@ use super::*; use memory::Stack; +use xmas_elf::ElfFile; +use core::slice; #[derive(Debug)] pub struct Process { @@ -47,4 +49,16 @@ impl Process { rsp: 0, // will be set at first schedule } } + + pub fn new_user(begin: usize, end: usize) -> Self { + let slice = unsafe{ slice::from_raw_parts(begin as *const u8, end - begin) }; + let elf = ElfFile::new(slice).expect("failed to read elf"); + for program_header in elf.program_iter() { + println!("{:?}", program_header); + } +// for section in elf.section_iter() { +// println!("{:?}", section); +// } + unimplemented!(); + } } \ No newline at end of file diff --git a/user/forktest.o b/user/forktest.o new file mode 100755 index 0000000000000000000000000000000000000000..13d05d577283c344dfe675850dfa013706949de2 GIT binary patch literal 11817 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%0DUD@IA+{hshe#9-c@{7Wyhp^6!j~j~rh+n4ItU z;zet8@Bw8+^^VF8CNFZJlALoSjYfqM%5*4?1(|Mlu(2T1S36i~LfJo`VIiSRvRRq6 z#a7%ZO*5vOO>3CxpEYFOQ^|y3(KQ7zGQBa61)1LCU}Hh1_c~Z<|JXm$A}K<*;9*KX1yEskjzGit`v#-Po(e+QYD8W!3b#uiV4fTEX&mnfjBsmg zk#9y*rH%D)yX@SHw}kSICC&Q-H^yD`LZ99rn9m2HJrxJRuU!0I$Z~!wW1j2nhPctx z{G=&)Zm~ggYH}nU?ibDYIMDSlQ)zo5Et-=F_3hAX5BI6>8qrK2FF4l{%@MmlGt?JO z;>gQRF&m8!CYTQQ_a|}6Zxr!?U^9(2n2aR`m^7X^wog+x!kDH6j#p=u3B#SUX2F7A zcNtv*g6!K2!1{aWun?tBSI*r`KV?JU6}SlFW;%@Bqo#hA4M-WK_}%wPV5G8|gazdY z9k8JA_mt+eF463kUapvC9jZ?n`;&zrXr5>c)0CnO&4gN{oH2k3)>)i)kPZFRy|w7c8vZR zh+>Rn;~}~WaZug!w_;uDrkN^vB~Y)2G<)AHw6rbqSJXviv3j{SJZC064F~ z61;eqU_YFd*#<7>+p!q0nhhAvC5k2saLSik{3cgyKnLCBaMCM>Hvq4PH-13y_$@Fv zuj`fM0A&d-(&yi7LIk4Feia0Mq-fH#04M$JW`KuD8D$MF(pUdyq!4{uXYgl>{B!~* zKP0E}ZC$DFC-U<~k^T48T0o+5mo!S5}?!v-HN!UqjbKkgKkn88PjaN19( z-HsxB%-}nU@LLUjcM*PdI#UR5u zHqL$yNSNO{#2?Dr?^QR;OjG9b&gMQ;lwtQp;KEN z@%Gv3jjqp*M}#`GRcFk6xJ#$+>fD#i=xF&6g`m%P@s@bOw?*aCB=b{Ljj*L5=Iwq$ z98});z0JcLnLf~vq9mde!2}_ z+%CPJm1{R<@FPX>h`#=4Je-{DqhB!k_!kT{2g^&;F9~Kg7tZVpXscOYIJ5r`Wx>EQ literal 0 HcmV?d00001