Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
tests/genericmake/project_files/Makefile
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Wed, 01 Aug 2018 13:09:45 +0300
changeset 2258 c9915bc620cd
parent 1542 0535a6b50534
permissions -rw-r--r--
Fix wrong code generation if EN/ENO are used in FBD/LD/SFC

This problem appears for example here

--------
------- | MOVE |
| MOVE1 |------|EN ENO|
------- | |
| |
------- | | -----------
| 23 |------|IN OUT|---| LocalVar0 |
------- -------- -----------


--------
------- | MOVE |
| MOVE2 |------|EN ENO|
------- | |
| |
------- | | -----------
| 15 |------|IN OUT|---| LocalVar0 |
------- -------- -----------

Before wrong code was generated for this case:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
LocalVar0 := MOVE6_OUT;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
LocalVar0 := MOVE4_OUT;

With this patch now following code is generated:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
IF MOVE6_ENO THEN
LocalVar0 := MOVE6_OUT;
END_IF;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
IF MOVE4_ENO THEN
LocalVar0 := MOVE4_OUT;
END_IF;


See discussion here:
https://sourceforge.net/p/beremiz/mailman/message/36378805/
1387
435965ca8b63 Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example
Edouard Tisserant
parents:
diff changeset 
     1
 
BEREMIZ_OBJS = $(BEREMIZSRC:.c=.o)
435965ca8b63 Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example
Edouard Tisserant
parents:
diff changeset 
     2
 












435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     3


all: warn some_binary













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     4


	@echo "*** all done ***"













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     5














435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     6


warn:













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     7


	@echo "*** Sample Makefile, does nothing ***"













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     8














435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




     9


some_binary: $(BEREMIZ_OBJS)













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




    10


	@echo "* Would link $^ -> $@"













435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




    11









1542






0535a6b50534
fix minor issue and do some cleanup work in genericmake example



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1387

diff
changeset




    12


%.o: %.c








1387






435965ca8b63
Re-introduced toolchain_makefile.py. This time, it comes with a 'Generic' target, and a 'genericmake' example



Edouard Tisserant


parents: 

diff
changeset




    13


	@echo "* Would compile $< -> $@"













beremiz