From cb3d44a27ca42a80bca4fffb55954fbd54273db4 Mon Sep 17 00:00:00 2001 From: pfaure Date: Thu, 24 Jun 2021 17:31:45 +0200 Subject: [PATCH] Fin merge et maj Makefile --- Interpreteur | 2 +- InterpreteurRegistres | 2 +- Makefile | 28 +++++++++++++++++++++++++++- Processeur | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Interpreteur b/Interpreteur index 725e012..9b91ac0 160000 --- a/Interpreteur +++ b/Interpreteur @@ -1 +1 @@ -Subproject commit 725e0125079b6bde8ad032a3be21910980900ec4 +Subproject commit 9b91ac00367bf25679448763cbc02c132bcaf090 diff --git a/InterpreteurRegistres b/InterpreteurRegistres index cf119a9..bc036e3 160000 --- a/InterpreteurRegistres +++ b/InterpreteurRegistres @@ -1 +1 @@ -Subproject commit cf119a9a257d0885c86920f0cd6945cbbf4134fa +Subproject commit bc036e3c948c7efc893f07195dbec34e9e20c446 diff --git a/Makefile b/Makefile index 66a8b95..95769fa 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,24 @@ SOURCE=null QUOI=null default: - @echo "Specifiez une cible [compile|clean|exec]" + @echo "Specifiez une cible [secure|unsecure|compile|exec|exec_secure|exec_unsecure|clean]" + + + + +secure: + @sed -i 's/#define SECURISED (0)/#define SECURISED (1)/g' Interpreteur/Tables/tables.c InterpreteurRegistres/Tables/tables.c Compilateur/Lex_Yacc/as.y + @sed -i 's/constant SECURISED : boolean := false;/constant SECURISED : boolean := true;/g' Processeur/Processeur.srcs/sources_1/new/System.vhd + + + + +unsecure: + @sed -i 's/#define SECURISED (1)/#define SECURISED (0)/g' Interpreteur/Tables/tables.c InterpreteurRegistres/Tables/tables.c Compilateur/Lex_Yacc/as.y + @sed -i 's/constant SECURISED : boolean := true;/constant SECURISED : boolean := false;/g' Processeur/Processeur.srcs/sources_1/new/System.vhd + + + compile: ifeq ($(QUOI),null) @@ -49,6 +66,15 @@ clean: $(MAKE) -C CrossAssembleur clean @rm -f ./*.memasm ./*.regasm ./*.bin + + + +exec_secure: secure compile exec + +exec_unsecure: unsecure compile exec + + + exec: ifeq ($(SOURCE),null) @echo "USAGE : make exec SOURCE=\"file_name\" QUOI=\"[compile|interprete|interprete_registres|cross_assemble|load|all]\"" diff --git a/Processeur b/Processeur index a70b442..1c8364b 160000 --- a/Processeur +++ b/Processeur @@ -1 +1 @@ -Subproject commit a70b442150f8ff4e8974c10559c3db47109a5609 +Subproject commit 1c8364b30d5f956cf5b101acc7feec19d849cda9