Correct an incoherency with arith and label types.

This commit is contained in:
Manoel Trapier 2013-03-19 15:05:37 +01:00 committed by Manoël Trapier
parent 08d1784f95
commit 1ed1edf94d
7 changed files with 20 additions and 15 deletions

View File

@ -23,7 +23,9 @@
/* All preprocessor arithmetic should be done in longs. /* All preprocessor arithmetic should be done in longs.
*/ */
#define arith long /* dummy */ #include <stdint.h>
typedef int32_t arith; /* dummy */
#endif /* SPECIAL_ARITHMETICS */ #endif /* SPECIAL_ARITHMETICS */

View File

@ -22,6 +22,8 @@
#else /* SPECIAL_ARITHMETICS */ #else /* SPECIAL_ARITHMETICS */
/* not implemented yet */ /* not implemented yet */
#define arith int /* dummy */ #include <stdint.h>
typedef int32_t arith; /* dummy */
#endif /* SPECIAL_ARITHMETICS */ #endif /* SPECIAL_ARITHMETICS */

View File

@ -20,6 +20,6 @@
#include <stdint.h> #include <stdint.h>
#define arith int32_t /* dummy */ typedef int32_t arith; /* dummy */
#endif /* LANG_CEM_CPP_ANSI_ARITH_H */ #endif /* LANG_CEM_CPP_ANSI_ARITH_H */

View File

@ -3,5 +3,10 @@
* See the copyright notice in the ACK home directory, in the file "Copyright". * See the copyright notice in the ACK home directory, in the file "Copyright".
*/ */
/* $Id$ */ /* $Id$ */
#ifndef H_EM_ARITH_H
#define H_EM_ARITH_H
#include <stdint.h>
#define arith long typedef int32_t arith;
#endif /* H_EM_ARITH_H */

View File

@ -8,17 +8,14 @@
#include "em_mesX.h" #include "em_mesX.h"
#include "ansi.h" #include "ansi.h"
#include <em_arith.h>
#include <em_label.h>
void C_flush(); void C_flush();
void C_internal_error(); void C_internal_error();
void C_putbyte(int c); void C_putbyte(int c);
#ifndef arith struct e_instr;
#define arith long
#endif
#ifndef label
#define label unsigned int
#endif
_PROTOTYPE(void C_ms_com, (char *)); _PROTOTYPE(void C_ms_com, (char *));
_PROTOTYPE(void C_ms_ego, (int, arith, arith, int)); _PROTOTYPE(void C_ms_ego, (int, arith, arith, int));
@ -36,6 +33,7 @@ _PROTOTYPE(void C_ms_stb_dnam, (char *, int, int, char *, arith));
_PROTOTYPE(void C_ms_stb_ilb, (char *, int, int, label)); _PROTOTYPE(void C_ms_stb_ilb, (char *, int, int, label));
_PROTOTYPE(void C_ms_stb_pnam, (char *, int, int, char *)); _PROTOTYPE(void C_ms_stb_pnam, (char *, int, int, char *));
_PROTOTYPE(void C_ms_std, (char *, int, int)); _PROTOTYPE(void C_ms_std, (char *, int, int));
_PROTOTYPE(int C_out, (struct e_instr *p));
#ifdef PEEPHOLE #ifdef PEEPHOLE
#include "em_codeO.h" #include "em_codeO.h"

View File

@ -5,7 +5,8 @@
/* $Id$ */ /* $Id$ */
#ifndef H_LABEL_H #ifndef H_LABEL_H
#define H_LABEL_H #define H_LABEL_H
#include <stdint.h>
#define label unsigned int typedef int32_t label;
#endif /* H_LABEL_H */ #endif /* H_LABEL_H */

View File

@ -8,10 +8,7 @@
#define __FLT_INCLUDED__ #define __FLT_INCLUDED__
#include "ansi.h" #include "ansi.h"
#include <em_arith.h>
#ifndef arith
#define arith long
#endif
struct flt_mantissa { struct flt_mantissa {
long flt_h_32; /* high order 32 bits of mantissa */ long flt_h_32; /* high order 32 bits of mantissa */