Merge pull request #113 from riscv/debug_readme

[riscv-isa-sim.git] / riscv / riscv.mk.in

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 882f34db7163643e98c41adff43da11aafbe6a21..05e316a438ad4dd68e1e9f2646328afc1d5c1758 100644 (file)
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -7,9 +7,9 @@ riscv_subproject_deps = \
 riscv_install_prog_srcs = \
 
 riscv_hdrs = \
-       htif.h \
        common.h \
        decode.h \
+       devices.h \
        disasm.h \
        mmu.h \
        processor.h \
@@ -18,16 +18,19 @@ riscv_hdrs = \
        encoding.h \
        cachesim.h \
        memtracer.h \
+       tracer.h \
        extension.h \
        rocc.h \
        insn_template.h \
        mulhi.h \
+       debug_module.h \
+       remote_bitbang.h \
+       jtag_dtm.h \
 
 riscv_precompiled_hdrs = \
        insn_template.h \
 
 riscv_srcs = \
-       htif.cc \
        processor.cc \
        execute.cc \
        sim.cc \
@@ -40,6 +43,12 @@ riscv_srcs = \
        extensions.cc \
        rocc.cc \
        regnames.cc \
+       devices.cc \
+       rom.cc \
+       clint.cc \
+       debug_module.cc \
+       remote_bitbang.cc \
+       jtag_dtm.cc \
        $(riscv_gen_srcs) \
 
 riscv_test_srcs =
@@ -81,7 +90,6 @@ riscv_insn_list = \
        bltu \
        bne \
        c_add \
-       c_addi16sp \
        c_addi4spn \
        c_addi \
        c_addw \
@@ -104,15 +112,12 @@ riscv_insn_list = \
        c_jr \
        c_li \
        c_lui \
-       c_lbu \
        c_lw \
        c_lwsp \
        c_mv \
        c_or \
-       c_sll \
        c_slli \
        c_srai \
-       c_srl \
        c_srli \
        c_sub \
        c_subw \
@@ -129,6 +134,9 @@ riscv_insn_list = \
        divu \
        divuw \
        divw \
+       dret \
+       ebreak \
+       ecall \
        fadd_d \
        fadd_s \
        fclass_d \
@@ -174,9 +182,9 @@ riscv_insn_list = \
        fmul_d \
        fmul_s \
        fmv_d_x \
-       fmv_s_x \
+       fmv_w_x \
        fmv_x_d \
-       fmv_x_s \
+       fmv_x_w \
        fnmadd_d \
        fnmadd_s \
        fnmsub_d \
@@ -193,7 +201,6 @@ riscv_insn_list = \
        fsub_d \
        fsub_s \
        fsw \
-       hrts \
        jal \
        jalr \
        lb \
@@ -206,8 +213,7 @@ riscv_insn_list = \
        lui \
        lw \
        lwu \
-       mrth \
-       mrts \
+       mret \
        mul \
        mulh \
        mulhsu \
@@ -220,12 +226,10 @@ riscv_insn_list = \
        remuw \
        remw \
        sb \
-       sbreak \
-       scall \
        sc_d \
        sc_w \
        sd \
-       sfence_vm \
+       sfence_vma \
        sh \
        sll \
        slli \