From dcc24c3645b3878bf3454345dbcfdf7ef1a0ba10 Mon Sep 17 00:00:00 2001
From: biouman <>
Date: Sun, 15 Apr 2001 11:20:38 +0000
Subject: *** empty log message ***

---
 include/Makefile.am |  2 +-
 include/alu.h       |  2 +-
 include/archi.h     | 21 ---------------------
 include/fpu.h       |  2 +-
 include/interne.h   |  2 +-
 include/memoire.h   |  2 +-
 include/registre.h  |  2 +-
 include/simulator.h | 21 +++++++++++++++++++++
 8 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 include/archi.h
 create mode 100644 include/simulator.h

(limited to 'include')

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/archi.h b/include/archi.h
deleted file mode 100644
index 2520343..0000000
--- a/include/archi.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ARCHI_H__
-#define __ARCHI_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 */
-#define NB_REGISTRES_UTILISABLES 32	/*  Nombre de registres que le processeur a à sa disposition    */
-#define REG_RG  32		/*  Numero du registre Rg   */
-#define REG_RD  33		/*  Numero du registre Rd   */
-#define REG_PC  34		/*  Numero du registre PC   */
-#define REG_FLAG    35		/*  Numero du registre de flags */
-#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)  */
-
-Uint32 memoire_principale[TAILLE_MEMOIRE];
-Uint32 registre[NB_REGISTRES_PHYSIQUES];	/*  Registres classiques    */
-Uint32 Err_Mem;			/*  en cas d'erreur l/e en mémoire principale   */
-Uint32 Err_Reg;			/*  en cas d'erreur l/e dans un registre        */
-
-#endif
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/simulator.h b/include/simulator.h
new file mode 100644
index 0000000..e2df994
--- /dev/null
+++ b/include/simulator.h
@@ -0,0 +1,21 @@
+#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 */
+#define NB_REGISTRES_UTILISABLES 32	/*  Nombre de registres que le processeur a à sa disposition    */
+#define REG_RG  32		/*  Numero du registre Rg   */
+#define REG_RD  33		/*  Numero du registre Rd   */
+#define REG_PC  34		/*  Numero du registre PC   */
+#define REG_FLAG    35		/*  Numero du registre de flags */
+#define REG_PUSHPOP 36		/*  Numero du registre de Push-Pop */
+#define ADD_PP  (TAILLE_MEMOIRE-1)	/* Emplacement de la pile */
+
+#include "types.h"
+
+Uint32 memoire_principale[TAILLE_MEMOIRE];
+Uint32 registre[NB_REGISTRES_PHYSIQUES];	/*  Registres classiques    */
+Uint32 Err_Mem;			/*  en cas d'erreur l/e en mémoire principale   */
+Uint32 Err_Reg;			/*  en cas d'erreur l/e dans un registre        */
+
+#endif
-- 
cgit v1.2.3