diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/alu.h | 2 | ||||
| -rw-r--r-- | include/fpu.h | 2 | ||||
| -rw-r--r-- | include/interne.h | 2 | ||||
| -rw-r--r-- | include/memoire.h | 2 | ||||
| -rw-r--r-- | include/registre.h | 2 | ||||
| -rw-r--r-- | include/simulator.h (renamed from include/archi.h) | 6 |
7 files changed, 9 insertions, 9 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 */ |