From bab041a1349f2d447680e9ea855261835e5ffef3 Mon Sep 17 00:00:00 2001 From: fche Date: Mon, 13 Aug 2007 14:47:43 +0000 Subject: [PATCH] 2007-08-13 Frank Ch. Eigler * common_model.h: Change #include guard name. 2007-08-13 Frank Ch. Eigler * sh.h: Protect CGEN_CPU_FPU macro against multiple definitions. * common_model.h: Change #include guard name. --- sid/component/cgen-cpu/mep/ChangeLog | 4 ++++ sid/component/cgen-cpu/mep/common_model.h | 6 +++--- sid/component/cgen-cpu/sh/ChangeLog | 5 +++++ sid/component/cgen-cpu/sh/common_model.h | 6 +++--- sid/component/cgen-cpu/sh/sh.h | 2 ++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sid/component/cgen-cpu/mep/ChangeLog b/sid/component/cgen-cpu/mep/ChangeLog index 0c5d3c2677..a3536f1a81 100644 --- a/sid/component/cgen-cpu/mep/ChangeLog +++ b/sid/component/cgen-cpu/mep/ChangeLog @@ -1,3 +1,7 @@ +2007-08-13 Frank Ch. Eigler + + * common_model.h: Change #include guard name. + 2007-01-03 Dave Brolley * Makefile.am (libmep_la_LIBADD): Remove cgen-bitset.lo. diff --git a/sid/component/cgen-cpu/mep/common_model.h b/sid/component/cgen-cpu/mep/common_model.h index bd882d831c..9c333bda7a 100644 --- a/sid/component/cgen-cpu/mep/common_model.h +++ b/sid/component/cgen-cpu/mep/common_model.h @@ -6,8 +6,8 @@ // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. -#ifndef COMMON_MODEL_H -#define COMMON_MODEL_H +#ifndef MEP_COMMON_MODEL_H +#define MEP_COMMON_MODEL_H #include #include "cgen-types.h" @@ -135,4 +135,4 @@ private: sid::host_int_8 save_total_latency; }; -#endif /* COMMON_MODEL_H */ +#endif /* MEP_COMMON_MODEL_H */ diff --git a/sid/component/cgen-cpu/sh/ChangeLog b/sid/component/cgen-cpu/sh/ChangeLog index 0541d23d78..258e05652f 100644 --- a/sid/component/cgen-cpu/sh/ChangeLog +++ b/sid/component/cgen-cpu/sh/ChangeLog @@ -1,3 +1,8 @@ +2007-08-13 Frank Ch. Eigler + + * sh.h: Protect CGEN_CPU_FPU macro against multiple definitions. + * common_model.h: Change #include guard name. + 2006-10-18 Dave Brolley * Contribute the following changes: diff --git a/sid/component/cgen-cpu/sh/common_model.h b/sid/component/cgen-cpu/sh/common_model.h index 2bdc0366d4..c80fa05b92 100644 --- a/sid/component/cgen-cpu/sh/common_model.h +++ b/sid/component/cgen-cpu/sh/common_model.h @@ -6,8 +6,8 @@ // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. -#ifndef COMMON_MODEL_H -#define COMMON_MODEL_H +#ifndef SH_COMMON_MODEL_H +#define SH_COMMON_MODEL_H #include #include "cgen-types.h" @@ -161,4 +161,4 @@ protected: sid::host_int_4 shift_busy; }; -#endif /* COMMON_MODEL_H */ +#endif /* SH_COMMON_MODEL_H */ diff --git a/sid/component/cgen-cpu/sh/sh.h b/sid/component/cgen-cpu/sh/sh.h index d7ecebaa25..6485660d4f 100644 --- a/sid/component/cgen-cpu/sh/sh.h +++ b/sid/component/cgen-cpu/sh/sh.h @@ -95,7 +95,9 @@ namespace sh // Floating point support cgen_fpu fpu; +#ifndef CGEN_CPU_FPU #define CGEN_CPU_FPU(cpu) (&(cpu)->fpu) +#endif protected: virtual BI sh64_endian () const = 0; -- 2.11.0