From 72538294fb1eb2e4dcd5d818c78bcdf78b0de491 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 19 Mar 2012 06:36:09 -0400 Subject: gcc: Clean-up of non-C++0x compliant code, first steps This patch cleans up a number of minor issues aiming to get closer to compliance with the C++0x standard as interpreted by gcc and clang (compile with std=c++0x and -pedantic-errors). In particular, the patch cleans up enums where the last item was succeded by a comma, namespaces closed by a curcly brace followed by a semi-colon, and the use of the GNU-extension typeof (replaced by templated functions). It does not address variable-length arrays, zero-size arrays, anonymous structs, range expressions in switch statements, and the use of long long. The generated CPU code also has a large number of issues that remain to be fixed, mainly related to overflows in implicit constant conversion (due to shifts). --- src/arch/alpha/isa/main.isa | 2 +- src/arch/alpha/isa_traits.hh | 2 +- src/arch/alpha/types.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arch/alpha') diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index e87a184c3..163e0a26f 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -222,7 +222,7 @@ output header {{ /// this class and derived classes. Maybe these should really /// live here and not in the AlphaISA namespace. enum DependenceTags { - FP_Base_DepTag = AlphaISA::FP_Base_DepTag, + FP_Base_DepTag = AlphaISA::FP_Base_DepTag }; /// Constructor. diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh index 97cb845bf..5738ccdb1 100644 --- a/src/arch/alpha/isa_traits.hh +++ b/src/arch/alpha/isa_traits.hh @@ -119,7 +119,7 @@ enum { MachineBytes = 8, WordBytes = 4, HalfwordBytes = 2, - ByteBytes = 1, + ByteBytes = 1 }; // return a no-op instruction... used for instruction fetch faults diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh index 645e09105..b1411d46e 100644 --- a/src/arch/alpha/types.hh +++ b/src/arch/alpha/types.hh @@ -48,7 +48,7 @@ enum annotes { ANNOTE_NONE = 0, // An impossible number for instruction annotations - ITOUCH_ANNOTE = 0xffffffff, + ITOUCH_ANNOTE = 0xffffffff }; } // namespace AlphaISA -- cgit v1.2.3