Skip to content

Commit

Permalink
Bugfix for enable/disable xsecure features
Browse files Browse the repository at this point in the history
Signed-off-by: Henrik Fegran <[email protected]>
  • Loading branch information
silabs-hfegran committed Sep 28, 2023
1 parent 03055c2 commit 2b45e37
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions cv32e40s/env/corev-dv/cv32e40s_asm_program_gen.sv
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@ class cv32e40s_asm_program_gen extends corev_asm_program_gen;
end
2'b01: begin
instr = {
$sformatf("add x%0d, x%0d, zero", cfg.gpr[0], cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x4", cfg.gpr[0], cfg.gpr[0]),
$sformatf("lui x%0d, 0x0", cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x4", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrs x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("enable_hint_instr", hart), instr);
end
2'b10: begin
instr = {
$sformatf("lui x%0d, 0xf0", cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x2", cfg.gpr[0], cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x2", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrs x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("enable_dummy_instr", hart), instr);
end
2'b11: begin
instr = {
$sformatf("lui x%0d, 0xf0", cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x6", cfg.gpr[0], cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x6", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrs x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("enable_dummy_hint_instr", hart), instr);
Expand All @@ -73,24 +73,24 @@ class cv32e40s_asm_program_gen extends corev_asm_program_gen;
end
2'b01: begin
instr = {
$sformatf("add x%0d, x%0d, zero", cfg.gpr[0], cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x1", cfg.gpr[0], cfg.gpr[0]),
$sformatf("lui x%0d, 0", cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x1", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrc x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("disable_pc_hardening_data_ind_timing", hart), instr);
end
2'b10: begin
instr = {
$sformatf("add x%0d, x%0d, zero", cfg.gpr[0], cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x8", cfg.gpr[0], cfg.gpr[0]),
$sformatf("lui x%0d, 0", cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x8", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrc x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("disable_pc_hardening_data_ind_timing", hart), instr);
end
2'b11: begin
instr = {
$sformatf("add x%0d, x%0d, zero", cfg.gpr[0], cfg.gpr[0]),
$sformatf("addi x%0d, x%0d, 0x9", cfg.gpr[0], cfg.gpr[0]),
$sformatf("lui x%0d, 0", cfg.gpr[0]),
$sformatf("ori x%0d, x%0d, 0x9", cfg.gpr[0], cfg.gpr[0]),
$sformatf("csrrc x0, 0xbf0, x%0d", cfg.gpr[0])
};
gen_section(get_label("disable_pc_hardening_data_ind_timing", hart), instr);
Expand Down

0 comments on commit 2b45e37

Please sign in to comment.