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

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

Browse Source
This commit is contained in:
Baptiste 2022-11-23 16:29:13 +01:00
commit 24353ea0ef
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/machine.rs
View File

@ -1,7 +1,7 @@
use crate::decode::*; use crate::decode::*;
use crate::print::*; use crate::print::*;
// doit disparaitre /// doit disparaitre
const MEM_SIZE : usize= 4096; const MEM_SIZE : usize= 4096;
pub struct Machine { pub struct Machine {
@ -37,10 +37,11 @@ impl Machine {
} }
/* /// Execute the instructions table of a machine putted in param
execute the instructions table of a machine putted in param ///
@param machine which contains a table of instructions /// ### Parameters
*/ ///
/// - **machine** which contains a table of instructions
pub fn run(machine : Machine){ pub fn run(machine : Machine){
let mut m = machine; let mut m = machine;
loop{ loop{
@ -48,10 +49,11 @@ impl Machine {
} }
} }
/* /// execute the current instruction
execute the current instruction ///
@param machine which contains a table of instructions and a pc to the actual instruction /// ### Parameters
*/ ///
/// - **machine** which contains a table of instructions and a pc to the actual instruction
pub fn one_instruction(machine :&mut Machine) { pub fn one_instruction(machine :&mut Machine) {
let mut unsigned_reg1 : u64 = 0; let mut unsigned_reg1 : u64 = 0;
@ -118,7 +120,7 @@ impl Machine {
if inst.funct7_smaller == RISCV_OPI_SRI_SRLI { if inst.funct7_smaller == RISCV_OPI_SRI_SRLI {
machine.int_reg[inst.rd as usize] = (machine.int_reg[inst.rs1 as usize] >> inst.shamt) & machine.shiftmask[inst.shamt as usize]; machine.int_reg[inst.rd as usize] = (machine.int_reg[inst.rs1 as usize] >> inst.shamt) & machine.shiftmask[inst.shamt as usize];
} else { // SRAI } else { // SRAI
machine.int_reg[inst.rd as usize] = (machine.int_reg[inst.rs1 as usize] >> inst.shamt); machine.int_reg[inst.rd as usize] = machine.int_reg[inst.rs1 as usize] >> inst.shamt;
} }
} }
_ => { println!("{} inconnu", inst.funct3); } _ => { println!("{} inconnu", inst.funct3); }
@ -131,7 +133,7 @@ impl Machine {
}, },
RISCV_OP => { RISCV_OP => {
if(inst.funct7 == 1){ if inst.funct7 == 1{
match inst.funct3 { match inst.funct3 {
RISCV_OP_M_MUL => { RISCV_OP_M_MUL => {
long_result = (machine.int_reg[inst.rs1 as usize] * machine.int_reg[inst.rs2 as usize]) as i128; long_result = (machine.int_reg[inst.rs1 as usize] * machine.int_reg[inst.rs2 as usize]) as i128;
@ -158,7 +160,7 @@ impl Machine {
machine.int_reg[inst.rd as usize] = ((long_result >> 64) & 0xffffffffffffffff) as u64; machine.int_reg[inst.rd as usize] = ((long_result >> 64) & 0xffffffffffffffff) as u64;
}, },
RISCV_OP_M_DIV => { RISCV_OP_M_DIV => {
machine.int_reg[inst.rd as usize] = (machine.int_reg[inst.rs1 as usize] / machine.int_reg[inst.rs2 as usize]); machine.int_reg[inst.rd as usize] = machine.int_reg[inst.rs1 as usize] / machine.int_reg[inst.rs2 as usize];
} }
_ => { _ => {
println!("RISCV_OP : funct7 = 1 (Multiplication) :: Error\n"); println!("RISCV_OP : funct7 = 1 (Multiplication) :: Error\n");
@ -242,26 +244,26 @@ impl Machine {
} }
} }
} else { } else {
let localDataa = machine.int_reg[inst.rs1 as usize] & 0xffffffff; let local_dataa = machine.int_reg[inst.rs1 as usize] & 0xffffffff;
let localDatab = machine.int_reg[inst.rs2 as usize] & 0xffffffff; let local_datab = machine.int_reg[inst.rs2 as usize] & 0xffffffff;
// Match case for base OP operation // Match case for base OP operation
match inst.funct3 { match inst.funct3 {
RISCV_OPW_ADDSUBW => { RISCV_OPW_ADDSUBW => {
if inst.funct7 == RISCV_OPW_ADDSUBW_ADDW { if inst.funct7 == RISCV_OPW_ADDSUBW_ADDW {
machine.int_reg[inst.rd as usize] = localDataa + localDatab; machine.int_reg[inst.rd as usize] = local_dataa + local_datab;
} else { // SUBW } else { // SUBW
machine.int_reg[inst.rd as usize] = localDataa - localDatab; machine.int_reg[inst.rd as usize] = local_dataa - local_datab;
} }
}, },
RISCV_OPW_SLLW => { RISCV_OPW_SLLW => {
machine.int_reg[inst.rd as usize] = localDataa << (localDatab & 0x1f); machine.int_reg[inst.rd as usize] = local_dataa << (local_datab & 0x1f);
}, },
RISCV_OPW_SRW => { RISCV_OPW_SRW => {
if inst.funct7 == RISCV_OPW_SRW_SRLW { if inst.funct7 == RISCV_OPW_SRW_SRLW {
machine.int_reg[inst.rd as usize] = localDataa >> (localDatab & 0x1f) & machine.shiftmask[32 + localDatab as usize]; machine.int_reg[inst.rd as usize] = local_dataa >> (local_datab & 0x1f) & machine.shiftmask[32 + local_datab as usize];
} else { // SRAW } else { // SRAW
machine.int_reg[inst.rd as usize] = localDataa >> (localDatab & 0x1f); machine.int_reg[inst.rd as usize] = local_dataa >> (local_datab & 0x1f);
} }
}, },
_ => { _ => {