Skip to content

Commit 82c1385

Browse files
committed
Use makefile to preprocess .mlog.jinja
1 parent dc5af21 commit 82c1385

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ ASM_PROGRAMS = $(patsubst asm/%.s,%,$(wildcard asm/*.s))
33
RUST_PROJECTS = $(patsubst rust/%,%,$(wildcard rust/*))
44
RUST_PROGRAMS = $(filter-out mlogv32,$(RUST_PROJECTS))
55

6+
MLOG_PROGRAMS = $(patsubst src/%.mlog.jinja,%,$(wildcard src/*.mlog.jinja))
7+
68
.PHONY: all
79
all: asm rust
810

@@ -12,6 +14,9 @@ asm: $(ASM_PROGRAMS)
1214
.PHONY: rust
1315
rust: $(RUST_PROGRAMS)
1416

17+
.PHONY: mlog
18+
mlog: $(MLOG_PROGRAMS)
19+
1520
.PHONY: coremark
1621
coremark:
1722
cd coremark/coremark && $(MAKE) PORT_DIR=../mlogv32 ITERATIONS=10 clean load
@@ -20,6 +25,8 @@ $(ASM_PROGRAMS): %: build/%.bin build/%.dump
2025

2126
$(RUST_PROGRAMS): %: build/rust/%.bin
2227

28+
$(MLOG_PROGRAMS): %: src/%.mlog
29+
2330
# see https://stackoverflow.com/a/61960833
2431
build/%-0.mlog: build/%.bin scripts/bin_to_mlog.py
2532
-rm -f build/$*-[0-9].mlog build/$*-[0-9][0-9].mlog
@@ -41,6 +48,9 @@ build/%.out: build/%.o
4148
build/%.o: asm/%.s | build
4249
riscv32-unknown-elf-gcc --compile -o build/$*.o asm/$*.s
4350

51+
src/%.mlog: src/%.mlog.jinja
52+
python -m mlogv32.preprocessor -o src/$*.mlog src/$*.mlog.jinja
53+
4454
build:
4555
mkdir -p build
4656

nodemon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"watch": ["src", "python"],
33
"ext": "jinja,py",
4-
"exec": "python -m mlogv32.preprocessor src/main.mlog.jinja -o src/main.mlog && python -m mlogv32.preprocessor src/init.mlog.jinja -o src/init.mlog"
4+
"exec": "make mlog"
55
}

0 commit comments

Comments
 (0)