Patmos and S4NoC 10: manipulator to the second-to-last reactors is added.

Author: EhsanKhodadad

examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/Makefile

@@ -9,25 +9,21 @@ BIN_DIR = $(CURDIR)/bin
 OBJ_DIR = $(CURDIR)/obj
 OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
 # OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
-OBJECTS = $(SOURCES:.c=.bc)
+OBJECTS ?= $(SOURCES:.c=.bc)
+FILTER_OUT ?= ""
 
 all: $(OUTPUT)
-	$(info Building $(LF_MAIN) federate $(LF_FED))
-	$(info Output directory: $(BIN_DIR))
-	$(info Output binary: $(OUTPUT))
-	$(info Sources: $(SOURCES))
-	$(info Compiler: $(CC))
-	$(info Compiler flags: $(CFLAGS))
 
 # Build rule
 $(OUTPUT): $(OBJECTS)
-	mkdir -p $(BIN_DIR)
-	$(CC) -c $(SOURCES) $(CFLAGS)
-	llvm-ar rcs $@ $(OBJECTS) 
+	@echo "BUILDING $(notdir $@) from $^ except $(FILTER_OUT)"
+	mkdir -p $(BIN_DIR) 
+	llvm-ar rcsv $@ $(filter-out $(FILTER_OUT), $(OBJECTS));
 
 %.bc: %.c
+	@echo "$(notdir $^) COMPILED TO $(notdir $@)"
 	mkdir -p $(OBJ_DIR)
-	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
+	$(CC) -emit-llvm -c $^ -o $@ $(CFLAGS)
 
 # Clean rule
 clean:

examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/Makefile

@@ -9,25 +9,21 @@ BIN_DIR = $(CURDIR)/bin
 OBJ_DIR = $(CURDIR)/obj
 OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
 # OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
-OBJECTS = $(SOURCES:.c=.bc)
+OBJECTS ?= $(SOURCES:.c=.bc)
+FILTER_OUT ?= ""
 
 all: $(OUTPUT)
-	$(info Building $(LF_MAIN) federate $(LF_FED))
-	$(info Output directory: $(BIN_DIR))
-	$(info Output binary: $(OUTPUT))
-	$(info Sources: $(SOURCES))
-	$(info Compiler: $(CC))
-	$(info Compiler flags: $(CFLAGS))
 
 # Build rule
 $(OUTPUT): $(OBJECTS)
-	mkdir -p $(BIN_DIR)
-	$(CC) -c $(SOURCES) $(CFLAGS)
-	llvm-ar rcs $@ $(OBJECTS) 
+	@echo "BUILDING $(notdir $@) from $^ except $(FILTER_OUT)"
+	mkdir -p $(BIN_DIR) 
+	llvm-ar rcsv $@ $(filter-out $(FILTER_OUT), $(OBJECTS));
 
 %.bc: %.c
+	@echo "$(notdir $^) COMPILED TO $(notdir $@)"
 	mkdir -p $(OBJ_DIR)
-	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
+	$(CC) -emit-llvm -c $^ -o $@ $(CFLAGS)
 
 # Clean rule
 clean:

examples/patmos/s4noc_fed_lf/build.sh

@@ -14,11 +14,16 @@ popd
 
 # Generate and build r2 sources
 pushd ./$LF_MAIN/r2
+    REACTOR_PATH=$(pwd)/src-gen/S4NoCFedLF/r2
     ./run_lfc.sh
-    make all 
+    sed -i 's/_lf_environment/_lf_environment_2/g' $REACTOR_PATH/lf_start.c
+    # make all FILTER_OUT="%unity.bc %action.bc %builtin_triggers.bc %clock_synchronization.bc %connection.bc %environment.bc %event.bc %federated.bc %logging.bc %network_channel.bc %physical_clock.bc %platform.bc %port.bc %queues.bc %reaction.bc %reactor.bc %scheduler.bc %serialization.bc %startup_coordinator.bc %tag.bc %timer.bc %trigger.bc %util.bc %pb_common.bc %pb_decode.bc %pb_encode.bc %message.pb.bc"
+    make all OBJECTS="$REACTOR_PATH/lf_federate.bc $REACTOR_PATH/$LF_MAIN/Dst.bc $REACTOR_PATH/lf_start.bc"
 popd
 
 mkdir -p $BIN_DIR
+
 patmos-clang main.c ./$LF_MAIN/r1/bin/$LF_MAIN.a ./$LF_MAIN/r2/bin/$LF_MAIN.a \
     -o $BIN_DIR/$LF_MAIN
 patemu $BIN_DIR/$LF_MAIN
+

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt

@@ -146,25 +146,21 @@ class UcFederatedTemplateGenerator(
             |OBJ_DIR = $(CURDIR)/obj
             |OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
             |# OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
-            |OBJECTS = $(SOURCES:.c=.bc)
+            |OBJECTS ?= $(SOURCES:.c=.bc)
+            |FILTER_OUT ?= ""
             |
             |all: $(OUTPUT)
-            |	$(info Building $(LF_MAIN) federate $(LF_FED))
-            |	$(info Output directory: $(BIN_DIR))
-            |	$(info Output binary: $(OUTPUT))
-            |	$(info Sources: $(SOURCES))
-            |	$(info Compiler: $(CC))
-            |	$(info Compiler flags: $(CFLAGS))
             |
             |# Build rule
             |$(OUTPUT): $(OBJECTS)
-            |	mkdir -p $(BIN_DIR)
-            |	$(CC) -c $(SOURCES) $(CFLAGS)
-            |	llvm-ar rcs $@ $(OBJECTS) 
+            |	@echo "BUILDING $(notdir $@) from $^ except $(FILTER_OUT)"
+            |	mkdir -p $(BIN_DIR) 
+            |	llvm-ar rcsv $@ $(filter-out $(FILTER_OUT), $(OBJECTS));
             |
             |%.bc: %.c
+            |	@echo "$(notdir $^) COMPILED TO $(notdir $@)"
             |	mkdir -p $(OBJ_DIR)
-            |	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
+            |	$(CC) -emit-llvm -c $^ -o $@ $(CFLAGS)
             |
             |# Clean rule
             |clean: