summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorbiouman <>2001-04-15 11:20:38 +0000
committerbiouman <>2001-04-15 11:20:38 +0000
commitdcc24c3645b3878bf3454345dbcfdf7ef1a0ba10 (patch)
tree1025dd726c5f75eed5e021a98acf97e6a785916f /lib
parent9e44b6dca12c57022d66bd1fe7e9b50c3d741389 (diff)
*** empty log message ***
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/fpu.c2
-rw-r--r--lib/interne.c2
-rw-r--r--lib/memoire.c2
-rw-r--r--lib/registre.c2
-rw-r--r--lib/simulator.c (renamed from lib/archi.c)2
6 files changed, 7 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f6172b3..b760f64 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I. -I.. -I$(includedir) -I../include
lib_LTLIBRARIES = libCompilo.la libSimul.la
libCompilo_la_SOURCES = assembler.c parser.c meta.c numbers.c hash.c exceptions.c
-libSimul_la_SOURCES = alu.c archi.c exceptions.c fpu.c interne.c memoire.c registre.c
+libSimul_la_SOURCES = alu.c simulator.c exceptions.c fpu.c interne.c memoire.c registre.c
libCompilo_la_LDFLAGS = -version-info $(ProjetArchi_VERSION_INFO)
libSimul_la_LFDLAGS = -version-info $(ProjetArchi_VERSION_INFO)
diff --git a/lib/fpu.c b/lib/fpu.c
index c14c87d..bb59aa3 100644
--- a/lib/fpu.c
+++ b/lib/fpu.c
@@ -1,5 +1,5 @@
#include "fpu.h"
-#include "archi.h"
+#include "types.h"
#include "exceptions.h"
#ifdef HAVE_CONFIG_H
diff --git a/lib/interne.c b/lib/interne.c
index bdab97e..05c4332 100644
--- a/lib/interne.c
+++ b/lib/interne.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include "interne.h"
-#include "archi.h"
+#include "simulator.h"
// mettre des exceptions dans les fcns ci dessous a la place de GestionErreurs
diff --git a/lib/memoire.c b/lib/memoire.c
index c8dd6a4..0bbd367 100644
--- a/lib/memoire.c
+++ b/lib/memoire.c
@@ -1,6 +1,6 @@
#include "memoire.h"
#include "interne.h"
-#include "archi.h"
+#include "simulator.h"
/*****************************************/
/** **/
diff --git a/lib/registre.c b/lib/registre.c
index f97595d..ccd284c 100644
--- a/lib/registre.c
+++ b/lib/registre.c
@@ -1,6 +1,6 @@
#include "registre.h"
#include "interne.h"
-#include "archi.h"
+#include "simulator.h"
/*****************************************/
/** **/
diff --git a/lib/archi.c b/lib/simulator.c
index cb8bb4a..ac1dae4 100644
--- a/lib/archi.c
+++ b/lib/simulator.c
@@ -7,6 +7,8 @@
#endif
#include "alu.h"
+#include "simulator.h"
+#include "interne.h"
#include "registre.h"
#include "memoire.h"
#include "fpu.h"