*** empty log message ***

15 files changed, 18 insertions, 16 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index c0bc500..9bfd99d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-include_HEADERS = alu.h archi.h assembler.h exceptions.h fpu.h hash.h interne.h memoire.h meta.h numbers.h parser.h registre.h types.h
+include_HEADERS = alu.h simulator.h assembler.h exceptions.h fpu.h hash.h interne.h memoire.h meta.h numbers.h parser.h registre.h types.h
diff --git a/include/alu.h b/include/alu.h
index 916a626..80a5d73 100644
--- a/include/alu.h
+++ b/include/alu.h
@@ -1,6 +1,6 @@
 #ifndef __ALU_H__
 #define __ALU_H__
-#include "archi.h"
+#include "types.h"
 
 Uint32 AdditionNonSigne(Uint32 a, Uint32 b);
 Uint32 AdditionSigne(Uint32 a, Uint32 b);
diff --git a/include/fpu.h b/include/fpu.h
index b10edfd..ea98e74 100644
--- a/include/fpu.h
+++ b/include/fpu.h
@@ -1,6 +1,6 @@
 #ifndef __FPU_H__
 #define __FPU_H__
-#include "archi.h"
+#include "types.h"
 void fpu(Uint32 opcode);
 
 #endif
\ No newline at end of file
diff --git a/include/interne.h b/include/interne.h
index 2dac208..2f91050 100644
--- a/include/interne.h
+++ b/include/interne.h
@@ -1,6 +1,6 @@
 #ifndef __INTERNE_H__
 #define __INTERNE_H__
-#include "archi.h"
+#include "types.h"
 #define VAL_MAX 4294967295
 void Reset(Uint32 * i);
 void Set(Uint32 * i);
diff --git a/include/memoire.h b/include/memoire.h
index 2fd8b8b..0598039 100644
--- a/include/memoire.h
+++ b/include/memoire.h
@@ -1,6 +1,6 @@
 #ifndef __MEMOIRE_H__
 #define __MEMOIRE_H__
-#include "archi.h"
+#include "types.h"
 Uint32 LD(Uint32 offset);
 void ST(Uint32 offset, Uint32 valeur);
 #endif
\ No newline at end of file
diff --git a/include/registre.h b/include/registre.h
index e7b9ff6..f5d8b5b 100644
--- a/include/registre.h
+++ b/include/registre.h
@@ -1,7 +1,7 @@
 #ifndef __REGISTRE_H__
 #define __REGISTRE_H__
 
-#include "archi.h"
+#include "types.h"
 
 Uint32 LireRegistreRG(void);
 Uint32 LireRegistreRD(void);
diff --git a/include/archi.h b/include/simulator.h
index 2520343..e2df994 100644
--- a/include/archi.h
+++ b/include/simulator.h
@@ -1,5 +1,5 @@
-#ifndef __ARCHI_H__
-#define __ARCHI_H__
+#ifndef __SIMULATOR_H__
+#define __SIMULATOR_H__
 
 #define TAILLE_MEMOIRE 1024	/*  Nombre maximum de mots que peut contenir la mémoire principale  */
 #define NB_REGISTRES_PHYSIQUES   64	/*  Nombre réel de registres */
@@ -11,7 +11,7 @@
 #define REG_PUSHPOP 36		/*  Numero du registre de Push-Pop */
 #define ADD_PP  (TAILLE_MEMOIRE-1)	/* Emplacement de la pile */
 
-typedef unsigned long int Uint32;	/*  type d'un mot mémoire (32 bits)  */
+#include "types.h"
 
 Uint32 memoire_principale[TAILLE_MEMOIRE];
 Uint32 registre[NB_REGISTRES_PHYSIQUES];	/*  Registres classiques    */
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"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9bc5c82..3fb24ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@ lib/parser.c
 lib/exceptions.c
 lib/interne.c
 lib/alu.c
-lib/archi.c
+lib/simulator.c
 lib/fpu.c
 lib/memoire.c
 lib/registre.c
diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index 8dcaa2c..b282c5a 100644
--- a/po/ProjetArchi.pot
+++ b/po/ProjetArchi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-15 05:17+0200\n"
+"POT-Creation-Date: 2001-04-15 13:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"