quentinlegot/burritos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'decode_print' of https://gitlab.istic.univ-rennes1.fr/simpleos/burritos into decode_print

Browse Source
This commit is contained in:
Samy Solhi 2023-02-15 17:21:25 +01:00
commit 6c08ed24b1
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/simulator/mem_cmp.rs
View File

@ -82,7 +82,7 @@ impl Section{
/* /*
* Representation de l'etat de la mémoire (apres execution.... a confirmer), sous forme de sections * Representation de l'etat de la mémoire (apres execution.... a confirmer), sous forme de sections
*/ */
struct Mem_Checker{ pub struct Mem_Checker{
pc: usize, pc: usize,
sp: usize, sp: usize,
sections: Vec<Section>, sections: Vec<Section>,
@ -91,10 +91,13 @@ struct Mem_Checker{
impl Mem_Checker{ impl Mem_Checker{
fn from(path: &String) -> Mem_Checker { pub fn from(path: &String) -> Mem_Checker {
let file = fs::File::open("test_file_section.txt").expect("Wrong filename"); let file = fs::File::open("test_file_section.txt").expect("Wrong filename");
let reader = io::BufReader::new(file); let reader = io::BufReader::new(&file);
let reader2 = io::BufReader::new(&file);
let lines = reader.lines();
let length = reader2.lines().count();
let mut pc: usize = 0; let mut pc: usize = 0;
let mut sp: usize = 0; let mut sp: usize = 0;
@ -103,15 +106,15 @@ impl Mem_Checker{
let mut tmp_addr_str: String = String::new(); let mut tmp_addr_str: String = String::new();
let mut tmp_len_str: String = String::new(); let mut tmp_len_str: String = String::new();
for (i,line) in reader.lines().enumerate() { for (i,line) in lines.enumerate() {
let current_line = line.unwrap(); let current_line = line.unwrap();
if i == current_line.len()-2 { if i == length-2 {
//Lecture de PC //Lecture de PC
pc = string_hex_to_usize(&current_line); pc = string_hex_to_usize(&current_line);
} }
else if i == current_line.len()-1 { else if i == length-1 {
//Lecture SP //Lecture SP
sp = string_hex_to_usize(&current_line); sp = string_hex_to_usize(&current_line);
} }
@ -151,7 +154,7 @@ impl Mem_Checker{
} }
fn fill_memory_from_Mem_Checker(m_c: &Mem_Checker, machine: &mut Machine){ pub fn fill_memory_from_Mem_Checker(m_c: &Mem_Checker, machine: &mut Machine){
machine.sp = m_c.sp; machine.sp = m_c.sp;
machine.pc = m_c.pc as u64; machine.pc = m_c.pc as u64;
@ -277,7 +280,6 @@ mod tests {
} }
#[test] #[test]
fn test_enum_start_at_zero(){ fn test_enum_start_at_zero(){
let v = vec![1,2,3]; let v = vec![1,2,3];

23
test_file_section.txt
View File

@ -1,8 +1,15 @@
0 addi sp,sp,-32
0 sd s0,24(sp)
FF FF addi s0,sp,32
F4A12200 sw zero,-20(s0)
A0 0A li a5,1
01022B sw a5,-24(s0)
0B 0F lw a5,-20(s0)
FFACBC5CEF mv a4,a5
lw a5,-24(s0)
addw a5,a4,a5
sw a5,-20(s0)
nop
ld s0,24(sp)
addi sp,sp,32
ret

BIN
test_programs/riscv_instructions/simple_arithmerics/unsigned_addition.o Normal file
View File

Binary file not shown.