diff options
author | Gabe Black <gabeblack@google.com> | 2017-12-13 00:53:34 -0800 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2017-12-13 23:51:59 +0000 |
commit | f6486a1bbe7714850980b9669d44ef8dec343a2a (patch) | |
tree | 8b782bd047fb997f1bd6c3dd8cdc8e39de288c92 /src/base | |
parent | 93a168c25e5bb396ee749d25a2ab80ce7bec1764 (diff) | |
download | gem5-f6486a1bbe7714850980b9669d44ef8dec343a2a.tar.xz |
arm,sparc,x86,base,cpu,sim: Replace the Twin(32|64)_t types with.
Replace them with std::array<>s.
Change-Id: I76624c87a1cd9b21c386a96147a18de92b8a8a34
Reviewed-on: https://gem5-review.googlesource.com/6602
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/SConscript | 1 | ||||
-rw-r--r-- | src/base/bigint.cc | 47 | ||||
-rw-r--r-- | src/base/bigint.hh | 95 |
3 files changed, 0 insertions, 143 deletions
diff --git a/src/base/SConscript b/src/base/SConscript index d1c4a14bf..a90b78486 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -36,7 +36,6 @@ if env['CP_ANNOTATE']: SimObject('Graphics.py') Source('atomicio.cc') Source('bitfield.cc') -Source('bigint.cc') Source('imgwriter.cc') Source('bmpwriter.cc') Source('callback.cc') diff --git a/src/base/bigint.cc b/src/base/bigint.cc deleted file mode 100644 index ce9942c9c..000000000 --- a/src/base/bigint.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Gabe Black - */ - -#include "base/bigint.hh" - -#include <iostream> - -using namespace std; - -ostream & operator << (ostream & os, const Twin64_t & t) -{ - os << t.a << ", " << t.b; - return os; -} - -ostream & operator << (ostream & os, const Twin32_t & t) -{ - os << t.a << ", " << t.b; - return os; -} diff --git a/src/base/bigint.hh b/src/base/bigint.hh deleted file mode 100644 index a078fdd65..000000000 --- a/src/base/bigint.hh +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Ali Saidi - */ - -#include <iostream> - -#include "base/logging.hh" -#include "base/types.hh" - -#ifndef __BASE_BIGINT_HH__ -#define __BASE_BIGINT_HH__ -// Create a couple of large int types for atomic reads -struct m5_twin64_t { - uint64_t a; - uint64_t b; - m5_twin64_t() : a(0), b(0) - {} - m5_twin64_t(const uint64_t x) : a(x), b(x) - {} - inline m5_twin64_t& operator=(const uint64_t x) - { - a = x; - b = x; - return *this; - } - - operator uint64_t() - { - panic("Tried to cram a twin64_t into an integer!\n"); - return a; - } -}; - -struct m5_twin32_t { - uint32_t a; - uint32_t b; - m5_twin32_t() - {} - m5_twin32_t(const uint32_t x) - { - a = x; - b = x; - } - inline m5_twin32_t& operator=(const uint32_t x) - { - a = x; - b = x; - return *this; - } - - operator uint32_t() - { - panic("Tried to cram a twin32_t into an integer!\n"); - return a; - } -}; - - -// This is for twin loads (two 64 bit values), not 1 128 bit value (as far as -// endian conversion is concerned! -typedef m5_twin64_t Twin64_t; -typedef m5_twin32_t Twin32_t; - -// Output operator overloads -std::ostream & operator << (std::ostream & os, const Twin64_t & t); -std::ostream & operator << (std::ostream & os, const Twin32_t & t); - -#endif // __BASE_BIGINT_HH__ - |