@@ -827,7 +827,7 @@ def parse_args(cwd):
827
827
command is not specified" )
828
828
parser .add_argument ("--isa" , type = str , default = "" ,
829
829
help = "RISC-V ISA subset" )
830
- parser .add_argument ("--priv" , type = str , default = "" ,
830
+ parser .add_argument ("--priv" , type = str , default = "m " ,
831
831
help = "RISC-V privilege modes enabled in simulation [su]" )
832
832
parser .add_argument ("-m" , "--mabi" , type = str , default = "" ,
833
833
help = "mabi used for compilation" , dest = "mabi" )
@@ -951,40 +951,40 @@ def load_config(args, cwd):
951
951
args .core_setting_dir = cwd + "/target/" + args .target
952
952
if args .target == "rv32imc" :
953
953
args .mabi = "ilp32"
954
- args .isa = "rv32imc "
954
+ args .isa = "rv32imc_zicsr_zifencei "
955
955
elif args .target == "rv32imafdc" :
956
956
args .mabi = "ilp32"
957
- args .isa = "rv32imafdc "
957
+ args .isa = "rv32imafdc_zicsr_zifencei "
958
958
elif args .target == "rv32imc_sv32" :
959
959
args .mabi = "ilp32"
960
- args .isa = "rv32imc "
960
+ args .isa = "rv32imc_zicsr_zifencei "
961
961
elif args .target == "multi_harts" :
962
962
args .mabi = "ilp32"
963
- args .isa = "rv32gc "
963
+ args .isa = "rv32gc_zicsr_zifencei "
964
964
elif args .target == "rv32imcb" :
965
965
args .mabi = "ilp32"
966
- args .isa = "rv32imcb "
966
+ args .isa = "rv32imcb_zicsr_zifencei "
967
967
elif args .target == "rv32i" :
968
968
args .mabi = "ilp32"
969
- args .isa = "rv32i "
969
+ args .isa = "rv32i_zicsr_zifencei "
970
970
elif args .target == "rv64imc" :
971
971
args .mabi = "lp64"
972
- args .isa = "rv64imc "
972
+ args .isa = "rv64imc_zicsr_zifencei "
973
973
elif args .target == "rv64imcb" :
974
974
args .mabi = "lp64"
975
- args .isa = "rv64imcb "
975
+ args .isa = "rv64imcb_zicsr_zifencei "
976
976
elif args .target == "rv64gc" :
977
977
args .mabi = "lp64"
978
- args .isa = "rv64gc "
978
+ args .isa = "rv64gc_zicsr_zifencei "
979
979
elif args .target == "rv64gcv" :
980
980
args .mabi = "lp64"
981
- args .isa = "rv64gcv "
981
+ args .isa = "rv64gcv_zicsr_zifencei "
982
982
elif args .target == "ml" :
983
983
args .mabi = "lp64"
984
- args .isa = "rv64imc "
984
+ args .isa = "rv64imc_zicsr_zifencei "
985
985
elif args .target == "rv64imafdc" :
986
986
args .mabi = "lp64"
987
- args .isa = "rv64imafdc "
987
+ args .isa = "rv64imafdc_zicsr_zifencei "
988
988
else :
989
989
sys .exit ("Unsupported pre-defined target: {}" .format (args .target ))
990
990
else :
0 commit comments