diff options
| author | Robert Norton | 2018-05-09 16:30:46 +0100 |
|---|---|---|
| committer | Robert Norton | 2018-05-09 16:58:19 +0100 |
| commit | 680acef72a84b1d3810ffd88c06639bafd1d4b3a (patch) | |
| tree | 77dbde83be6e172d7167c53634d319cdc041a818 | |
| parent | 3f472931d1f0d003c729d591b13619376ea93cf3 (diff) | |
Add targets for counting lines in mips, cheri and riscv. Can use either sloccount or cloc. sloccount seems to be reliable but lacks a way to tell it that sail files can be treated like ocaml without renaming the files. cloc has a nicer interface is lower quality in other regards like broken ocaml support in versions shipped with Ubuntu (e.g. treats {...} as comment, no nested comments support). For sail2 syntax this is OK because we use the C parser instead which gives the same results as sloccount.
| -rw-r--r-- | cheri/Makefile | 2 | ||||
| -rw-r--r-- | etc/loc.mk | 13 | ||||
| -rw-r--r-- | mips/Makefile | 6 | ||||
| -rw-r--r-- | riscv/Makefile | 7 |
4 files changed, 28 insertions, 0 deletions
diff --git a/cheri/Makefile b/cheri/Makefile index fb54f103..a5df5f1e 100644 --- a/cheri/Makefile +++ b/cheri/Makefile @@ -40,6 +40,8 @@ cheri128: $(CHERI128_SAILS) $(CHERI_MAIN) cheri128_trace: $(CHERI128_SAILS) $(CHERI_MAIN) $(SAIL) -ocaml_trace -o $@ $^ +LOC_FILES:=$(CHERI_SAILS) $(CHERI_MAIN) +include ../etc/loc.mk # TODO Using bit lists for now in Lem generation; for machine words, # monomorphisation is needed due to some variable length bitvectors, e.g. in diff --git a/etc/loc.mk b/etc/loc.mk new file mode 100644 index 00000000..bf79a723 --- /dev/null +++ b/etc/loc.mk @@ -0,0 +1,13 @@ +TEMPDIR:=sloc_tmp +loc: $(LOC_FILES) + @rm -rf $(TEMPDIR) + @mkdir -p $(TEMPDIR) + @cp $^ $(TEMPDIR) + @for f in $(TEMPDIR)/*.sail; do mv "$$f" "$${f%.sail}.c"; done + @sloccount --details $(TEMPDIR) | grep ansic + @sloccount $(TEMPDIR) | grep ansic + rm -rf $(TEMPDIR) + +cloc: $(LOC_FILES) + cloc --by-file --force-lang C,sail $^ + diff --git a/mips/Makefile b/mips/Makefile index 00703f62..6e3ef49e 100644 --- a/mips/Makefile +++ b/mips/Makefile @@ -28,5 +28,11 @@ M%.thy: m%.lem m%_types.lem mips_extras.lem lem -isa -outdir . -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ sed -i 's/datatype ast/datatype (plugins only: size) ast/' M$*_types.thy +LOC_FILES:=$(MIPS_PRE) $(MIPS_TLB) $(MIPS_SAILS) $(MIPS_MAIN) +include ../etc/loc.mk + +cloc: $(LOC_FILES) + cloc --by-file --force-lang C,sail $^ + clean: rm -rf mips Mips.thy mips.lem _sbuild diff --git a/riscv/Makefile b/riscv/Makefile index 781ec354..3cd235a7 100644 --- a/riscv/Makefile +++ b/riscv/Makefile @@ -34,6 +34,13 @@ Riscv.thy: riscv.lem riscv_extras.lem riscv.lem: $(SAIL_SRCS) Makefile $(SAIL_DIR)/sail -lem -o riscv -lem_mwords -lem_lib Riscv_extras $(SAIL_SRCS) +# we exclude prelude.sail here, most code there should move to sail lib +LOC_FILES:=$(SAIL_SRCS) main.sail +include ../etc/loc.mk + +cloc: $(LOC_FILES) + cloc --by-file --force-lang C,sail $^ + clean: -rm -rf riscv _sbuild -rm -f riscv.lem riscv_types.lem |